fix: change map addr offset to +384

.gitignore

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

Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "abi_stable"
@@ -1886,15 +1886,12 @@ dependencies = [
  "clap",
  "dataview 1.0.1",
  "enum-primitive-derive",
- "flate2",
  "itertools 0.13.0",
- "lazy_static",
  "local-ip-address",
  "log",
  "memflow",
  "memflow-native",
  "num-traits",
- "rand",
  "reqwest",
  "serde",
  "serde_json",
@@ -1902,7 +1899,6 @@ dependencies = [
  "tokio",
  "tower 0.5.1",
  "tower-http",
- "uuid",
  "vergen-gitcl",
 ]
 
@@ -2877,15 +2873,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
-[[package]]
-name = "uuid"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b"
-dependencies = [
- "getrandom",
-]
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"

Cargo.toml

@@ -38,12 +38,6 @@ local-ip-address = "0.6.3"
 # other
 itertools = "0.13.0"
 
-flate2 = "1.0"
-rand = "0.8"
-
-lazy_static = "1.4"
-
-uuid = { version = "1.3", features = ["v4"] }
 
 [build-dependencies]
 reqwest = { version = "0.12.9", features = ["blocking"] }

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://git.deadzone.lol/Wizzard/radarflow2-kvm.git`
+`git clone https://github.com/superyu1337/radarflow2.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://git.deadzone.lol/Wizzard/radarflow2-kvm.git`
+`git clone https://github.com/superyu1337/radarflow2.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, Clone)]
+#[derive(Parser)]
 #[command(author, version = version(), about, long_about = None)]
 pub struct Cli {
     /// Specifies the connector type for DMA

src/comms.rs

@@ -16,36 +16,12 @@ pub struct PlayerData {
     has_awp: bool,
 
     #[serde(rename = "isScoped")]
-    is_scoped: bool,
-
-    #[serde(rename = "playerName")]
-    player_name: String,
-
-    #[serde(rename = "weaponId")]
-    weapon_id: i16,
-
-    #[serde(rename = "money", default)]
-    money: i32,
-
-    #[serde(rename = "health", default)]
-    health: u32,
+    is_scoped: bool
 }
 
 impl PlayerData {
-    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, money: i32, health: u32) -> PlayerData {
-        PlayerData {
-            pos,
-            yaw,
-            player_type,
-            has_bomb,
-            has_awp,
-            is_scoped,
-            player_name,
-            weapon_id,
-            money,
-            health
-        }
+    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 }
     }
 }
 
@@ -69,24 +45,6 @@ pub enum EntityData {
     Bomb(BombData)
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CheatOptions {
-    #[serde(rename = "revealMoney")]
-    pub reveal_money: bool,
-
-    #[serde(rename = "displayMoney")]
-    pub display_money: bool,
-}
-
-impl Default for CheatOptions {
-    fn default() -> Self {
-        Self {
-            reveal_money: false,
-            display_money: true,
-        }
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct RadarData {
     freq: usize,
@@ -119,30 +77,13 @@ pub struct RadarData {
     #[serde(rename(serialize = "entityData"))]
     player_data: Vec<EntityData>,
 
-    #[serde(rename = "options")]
-    options: CheatOptions,
-
-    #[serde(skip)]
-    pub money_reveal_enabled: bool,
+    //#[serde(rename(serialize = "localYaw"))]
+    //local_yaw: f32,
 }
 
 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,
-            options: CheatOptions::default(),
-            money_reveal_enabled: false
-        }
+        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 }
     }
 
     /// Returns empty RadarData, it's also the same data that gets sent to clients when not ingame
@@ -158,15 +99,9 @@ impl RadarData {
             bomb_exploded: false,
             bomb_being_defused: false,
             bomb_defuse_length: 0.0,
-            bomb_defuse_end: 0.0,
-            options: CheatOptions::default(),
-            money_reveal_enabled: false
+            bomb_defuse_end: 0.0
         }
     }
-
-    pub fn get_entities(&self) -> &Vec<EntityData> {
-        &self.player_data
-    }
 }
 
 unsafe impl Send for RadarData {}

src/dma/context/mod.rs

@@ -97,9 +97,6 @@ impl DmaCtx {
         let mut team = 0i32;
         let mut clipping_weapon = 0u64;
         let mut is_scoped = 0u8;
-        let mut player_name_ptr = 0u64;
-        let mut money = 0i32;
-        let mut money_services_ptr = 0u64;
 
         {
             let mut batcher = MemoryViewBatcher::new(&mut self.process);
@@ -109,40 +106,18 @@ 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);
-
-            batcher.read_into(controller + cs2dumper::client::CCSPlayerController::m_pInGameMoneyServices, &mut money_services_ptr);
         }
-
-        if money_services_ptr != 0 {
-            let money_addr: Address = money_services_ptr.into();
-            money = self.process.read(money_addr + cs2dumper::client::CCSPlayerController_InGameMoneyServices::m_iAccount)?;
-        }
-
-        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, weapon_id) = {
+        let has_awp = {
             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)
+            items_def_idx == 9
         };
 
         Ok(BatchedPlayerData {
@@ -151,10 +126,7 @@ impl DmaCtx {
             team,
             health,
             has_awp,
-            is_scoped: is_scoped != 0,
-            player_name,
-            weapon_id,
-            money,
+            is_scoped: is_scoped != 0
         })
     }
 
@@ -206,8 +178,7 @@ impl DmaCtx {
         let mut data_vec: Vec<(Address, u64, Vec<(u64, i32)>)> = data_vec
             .into_iter()
             .map(|(pawn, _, wep_count, wep_base)| {
-                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();
+                let weps = (0..wep_count).into_iter().map(|idx| (0u64, idx)).collect();
                 (pawn, wep_base, weps)
             })
             .collect();
@@ -217,7 +188,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 + u64::saturating_mul(*idx as u64, 0x4), idx);
+                batcher.read_into(b + * idx * 0x4, idx);
             });
         });
         drop(batcher);
@@ -281,7 +252,4 @@ pub struct BatchedPlayerData {
     pub health: u32,
     pub has_awp: bool,
     pub is_scoped: bool,
-    pub player_name: String,
-    pub weapon_id: i16,
-    pub money: i32,
 }

src/dma/mod.rs

@@ -4,28 +4,17 @@ 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};
 
-pub mod context;
-pub mod threaddata;
+mod context;
+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,
-        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);
-    }
+    let mut data = CsData { recheck_bomb_holder: true, ..Default::default() };
     
     // For read timing
     let mut last_bomb_dropped = false;
@@ -58,17 +47,6 @@ 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);
@@ -98,18 +76,10 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
                 .into_iter()
                 .map(|(_, pawn)| pawn)
                 .collect();
-        
+
             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;
         }
 
@@ -168,25 +138,18 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
 
             // Bomb
             if data.bomb_dropped || data.bomb_planted {
-                if let Ok(node) = ctx.process.read_addr64(
+                let node = ctx.process.read_addr64(
                     data.bomb + cs2dumper::client::C_BaseEntity::m_pGameSceneNode as u64
-                ) {
-                    if let Ok(pos) = ctx.process.read(node + cs2dumper::client::CGameSceneNode::m_vecAbsOrigin) {
-                        entity_data.push(EntityData::Bomb(BombData::new(pos, data.bomb_planted)));
-                    }
-                }
+                ).unwrap();
+                let pos = ctx.process.read(node + cs2dumper::client::CGameSceneNode::m_vecAbsOrigin).unwrap();
+    
+                entity_data.push(EntityData::Bomb(BombData::new(pos, data.bomb_planted)));
             }
 
             // Local player
-            let local_data = match ctx.batched_player_read(
+            let local_data = ctx.batched_player_read(
                 data.local.into(), data.local_pawn.into()
-            ) {
-                Ok(data) => data,
-                Err(e) => {
-                    log::warn!("Failed to read local player data: {}", e);
-                    continue;
-                }
-            };
+            ).unwrap();
 
             if local_data.health > 0 {
                 let has_bomb = match data.bomb_holder {
@@ -197,16 +160,12 @@ 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.player_name,
-                            local_data.weapon_id,
-                            local_data.money,
-                            local_data.health
+                            local_data.is_scoped
                         )
                     )
                 );
@@ -214,49 +173,39 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
 
             // Other players
             for (controller, pawn) in &data.players {
-                match ctx.batched_player_read(*controller, *pawn) {
-                    Ok(player_data) => {
-                        if player_data.health < 1 {
-                            continue;
-                        }
+                let player_data = ctx.batched_player_read(*controller, *pawn).unwrap();
 
-                        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
-                            }
-                        };
-
-                        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,
-                                    player_data.money,
-                                    player_data.health
-                                )
-                            )
-                        );
-                    },
-                    Err(e) => {
-                        log::warn!("Failed to read player data: {}", e);
-                        continue;
-                    }
+                if player_data.health < 1 {
+                    continue;
                 }
+
+                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
+                    }
+                };
+
+                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;
@@ -273,12 +222,9 @@ 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;
@@ -293,10 +239,5 @@ 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,7 +38,6 @@ pub struct CsData {
     pub bomb_defuse_length: f32,
     pub bomb_exploded: bool,
     pub bomb_defused: bool,
-    pub money_reveal_enabled: bool,
 }
 
 
@@ -105,12 +104,10 @@ impl CsData {
                 }
             }
         } else if self.bomb_planted {
-            match ctx.get_plantedc4() {
-                Ok(bomb) => self.bomb = bomb,
-                Err(e) => {
-                    log::warn!("Failed to get planted bomb: {}", e);
-                }
-            }
+            let bomb = ctx.get_plantedc4()
+                .expect("Failed to get planted bomb");
+
+            self.bomb = bomb;
         }
     }
 

src/main.rs

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

src/money_reveal.rs

@@ -1,96 +0,0 @@
-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

@@ -1,51 +0,0 @@
-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

@@ -1,27 +1,20 @@
-use std::{sync::Arc, path::PathBuf, collections::HashMap};
+use std::{sync::Arc, path::PathBuf};
+
 use axum::{
     extract::{ws::{WebSocketUpgrade, WebSocket, Message}, State},
     response::Response,
     routing::get,
     Router,
 };
-use flate2::{write::GzEncoder, Compression};
-use std::io::Write;
-use tokio::sync::{RwLock, Mutex};
+
+use tokio::sync::RwLock;
 use tower_http::services::ServeDir;
 
-use crate::comms::{RadarData};
-
-struct ClientState {
-    last_entity_count: usize,
-    ping_ms: u32,
-    high_latency: bool,
-}
+use crate::comms::RadarData;
 
 #[derive(Clone)]
 struct AppState {
-    data_lock: Arc<RwLock<RadarData>>,
-    clients: Arc<Mutex<HashMap<String, ClientState>>>,
+    data_lock: Arc<RwLock<RadarData>>
 }
 
 async fn ws_handler(ws: WebSocketUpgrade, State(state): State<AppState>) -> Response {
@@ -30,128 +23,43 @@ async fn ws_handler(ws: WebSocketUpgrade, State(state): State<AppState>) -> Resp
 }
 
 async fn handle_socket(mut socket: WebSocket, state: AppState) {
-    let client_id = uuid::Uuid::new_v4().to_string();
-
-    {
-        let mut clients = state.clients.lock().await;
-        clients.insert(client_id.clone(), ClientState {
-            last_entity_count: 0,
-            ping_ms: 0,
-            high_latency: false,
-        });
-    }
-
-    let mut compression_buffer: Vec<u8> = Vec::with_capacity(65536);
-    let mut frame_counter = 0;
-    let mut skip_frames = false;
-
     while let Some(msg) = socket.recv().await {
         if let Ok(msg) = msg {
-            if let Ok(text) = msg.to_text() {
-                if text == "requestInfo" {
-                    frame_counter += 1;
-                    if skip_frames && frame_counter % 2 != 0 {
-                        continue;
+            if msg == Message::Text("requestInfo".to_string()) {
+                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()
+                        },
                     }
+                };
 
-                    let radar_data = state.data_lock.read().await;
-                    let mut clients = state.clients.lock().await;
-                    let client_state = clients.get_mut(&client_id).unwrap();
+                //println!("{str}");
 
-                    let entity_count = radar_data.get_entities().len();
-
-                    if entity_count > 5 && !skip_frames && client_state.ping_ms > 100 {
-                        skip_frames = true;
-                        log::info!("Enabling frame skipping for high latency client");
-                    }
-
-                    client_state.last_entity_count = entity_count;
-
-                    let Ok(json) = serde_json::to_string(&*radar_data) else {
-                        continue;
-                    };
-
-                    compression_buffer.clear();
-
-                    let compression_level = if json.len() > 20000 || client_state.high_latency {
-                        Compression::best()
-                    } else if json.len() > 5000 {
-                        Compression::default()
-                    } else {
-                        Compression::fast()
-                    };
-
-                    let mut encoder = GzEncoder::new(Vec::new(), compression_level);
-                    if encoder.write_all(json.as_bytes()).is_ok() {
-                        match encoder.finish() {
-                            Ok(compressed) => {
-                                if compressed.len() < json.len() {
-                                    let mut message = vec![0x01];
-                                    message.extend_from_slice(&compressed);
-                                    let _ = socket.send(Message::Binary(message)).await;
-                                } else {
-                                    let mut uncompressed = vec![0x00];
-                                    uncompressed.extend_from_slice(json.as_bytes());
-                                    let _ = socket.send(Message::Binary(uncompressed)).await;
-                                }
-                            },
-                            Err(_) => {
-                                let mut uncompressed = vec![0x00];
-                                uncompressed.extend_from_slice(json.as_bytes());
-                                let _ = socket.send(Message::Binary(uncompressed)).await;
-                            }
-                        }
-                    } else {
-                        let mut uncompressed = vec![0x00];
-                        uncompressed.extend_from_slice(json.as_bytes());
-                        let _ = socket.send(Message::Binary(uncompressed)).await;
-                    }
-                } 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
-                    };
-
-                    let response = serde_json::json!({
-                        "action": "toggleMoneyReveal",
-                        "status": "success",
-                        "enabled": new_value
-                    });
-
-                    let _ = socket.send(Message::Text(response.to_string())).await;
-                } else if text.starts_with("ping:") {
-                    if let Some(ping_str) = text.strip_prefix("ping:") {
-                        if let Ok(ping_ms) = ping_str.parse::<u32>() {
-                            let mut clients = state.clients.lock().await;
-                            if let Some(client) = clients.get_mut(&client_id) {
-                                client.ping_ms = ping_ms;
-                                client.high_latency = ping_ms > 100;
-                            }
-                        }
-                    }
-                    let _ = socket.send(Message::Text("pong".to_string())).await;
+                if socket.send(Message::Text(str)).await.is_err() {
+                    // client disconnected
+                    return;
                 }
             }
         } else {
-            break;
+            // client disconnected
+            return;
         }
     }
-    let mut clients = state.clients.lock().await;
-    clients.remove(&client_id);
 }
 
 pub async fn run(path: PathBuf, port: u16, data_lock: Arc<RwLock<RadarData>>) -> anyhow::Result<()> {
     let app = Router::new()
         .nest_service("/", ServeDir::new(path))
         .route("/ws", get(ws_handler))
-        .with_state(AppState {
-            data_lock,
-            clients: Arc::new(Mutex::new(HashMap::new()))
-        });
+        .with_state(AppState { data_lock });
 
     let address = format!("0.0.0.0:{}", port);
-    log::info!("Starting WebSocket server on {}", address);
     let listener = tokio::net::TcpListener::bind(address).await?;
     axum::serve(listener, app.into_make_service())
         .await?;

webradar/assets/json/de_train.json

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

webradar/index.html

@@ -1,107 +1,27 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>radar</title>
-    <link href="styles.css" rel="stylesheet" type="text/css" />
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/pako/2.1.0/pako.min.js"></script>
+    <title>radarflow</title>
+    <link href="styles.css" rel="stylesheet" type="text/css"/>
 </head>
-
 <body>
     <div id="canvasContainer">
-        <button id="showMenuBtn" onclick="toggleMenu(true)" style="display: none;">Show Menu</button>
         <div id="settingsHolder">
             <div class="settings">
                 <div>
-                    <input type="checkbox" onclick="togglePerformanceMode()" id="performanceMode" />
-                    <label for="performanceMode">Performance Mode</label>
-                </div>
-                <div>
-                    <input type="checkbox" onclick="toggleZoom()" id="zoomCheck" name="zoom" />
+                    <input type="checkbox" onclick="toggleZoom()" id="zoomCheck" name="zoom"/>
                     <label for="zoomCheck">Zoom</label>
                 </div>
                 <div>
-                    <input type="checkbox" onclick="toggleStats()" id="statsCheck" name="stats" />
+                    <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="toggleDisplayMoney()" id="moneyDisplay" name="money-display"
-                        checked />
-                    <label for="moneyDisplay">Display Money</label>
-                </div>
-                <div>
-                    <input type="checkbox" onclick="toggleHealth()" id="healthCheck" name="health" checked />
-                    <label for="healthCheck">Display Health</label>
-                </div>
-                <div>
-                    <input type="checkbox" onclick="toggleOffscreenIndicators()" id="offscreenCheck" name="offscreen" checked />
-                    <label for="offscreenCheck">Off-screen Indicators</label>
-                </div>
-                <div>
-                    <input type="checkbox" onclick="toggleRotate()" id="rotateCheck" name="rotate" checked />
-                    <label for="rotateCheck">Rotate Map</label>
-                </div>
-                <div>
-                    <input type="checkbox" onclick="toggleCentered()" id="centerCheck" name="center" checked />
-                    <label for="centerCheck">Player Centered</label>
-                    <div id="zoomLevelContainer" style="margin-top: 5px; margin-left: 20px; display: none;">
-                        <label for="zoomLevelSlider">Zoom Level: </label>
-                        <span id="zoomLevelValue">1.0</span><br>
-                        <input type="range" id="zoomLevelSlider" min="1.0" max="5.0" step="0.1" value="1.0"
-                            style="width: 100%; margin: 5px 0;" oninput="updateZoomLevel(this.value)">
-                    </div>
-                </div>
-                <div class="player-focus">
-                    <label for="playerSelect">Focus Player:</label>
-                    <select id="playerSelect" onchange="changePlayerFocus()">
-                        <option value="local">YOU</option>
-                    </select>
-                </div>
-                <div id="sizeControlsContainer"
-                    style="margin-top: 10px; padding: 5px; border-top: 1px solid rgba(255, 255, 255, 0.2);">
-                    <div class="size-control" style="margin-bottom: 8px;">
-                        <label for="textSizeSlider">Text Size: </label>
-                        <span id="textSizeValue">1.0</span><br>
-                        <input type="range" id="textSizeSlider" min="0.1" max="2.0" step="0.1" value="1.0"
-                            style="width: 100%; margin: 5px 0;" oninput="updateTextSize(this.value)">
-                    </div>
-                    <div class="size-control">
-                        <label for="entitySizeSlider">Player Size: </label>
-                        <span id="entitySizeValue">1.0</span><br>
-                        <input type="range" id="entitySizeSlider" min="0.5" max="2.0" step="0.1" value="1.0"
-                            style="width: 100%; margin: 5px 0;" oninput="updateEntitySize(this.value)">
-                    </div>
-                    <div class="size-control" style="margin-top: 8px;">
-                        <label for="healthBarSizeSlider">Health Bar Size: </label>
-                        <span id="healthBarSizeValue">1.0</span><br>
-                        <input type="range" id="healthBarSizeSlider" min="0.5" max="2.5" step="0.1" value="1.0"
-                            style="width: 100%; margin: 5px 0;" oninput="updateHealthBarSize(this.value)">
-                    </div>
-                </div>
-                <button id="showDangerousBtn" onclick="toggleDangerousOptions()">Show Dangerous Options</button>
-                <div class="dangerous-options" id="dangerousOptions">
-                    <div>
-                        <input type="checkbox" onclick="toggleMoneyReveal()" id="moneyReveal" name="money" />
-                        <label for="moneyReveal">Money Reveal (Write Memory)</label>
-                    </div>
-                </div>
-                <button id="hideMenuBtn" onclick="toggleMenu(false)">Hide Menu</button>
             </div>
         </div>
         <canvas id="canvas"></canvas>
     </div>
     <script src="script.js"></script>
-    <script src="webstuff.js"></script>
 </body>
-
 </html>

webradar/styles.css

@@ -1,14 +1,11 @@
-body {
+body {    
     margin: 0;
     overflow: hidden;
     display: flex;
     justify-content: center;
     align-items: center;
     height: 100vh;
-    background-color: #000000;
-    background-image: url('assets/image/background.png');
-    background-repeat: repeat;
-    background-size: 128px 128px;
+    background-color: #000000; /* Change the background color as needed */
 }
 
 #canvasContainer {
@@ -23,51 +20,15 @@ body {
 canvas {
     width: 100%;
     height: 100%;
-    image-rendering: -webkit-optimize-contrast;
-    image-rendering: crisp-edges;
 }
 
 #settingsHolder {
-    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;
-    font-size: 14px;
-    max-height: 90vh;
-    overflow-y: auto;
-}
-
-@media (max-width: 768px) {
-    #settingsHolder .settings {
-        font-size: 16px;
-        padding: 12px;
-    }
-
-    #settingsHolder .settings input[type="checkbox"] {
-        transform: scale(1.2);
-        margin-right: 8px;
-    }
-
-    #settingsHolder .settings>div {
-        padding: 6px 0;
-    }
+    visibility: hidden;
+    position: absolute;
+    top: inherit;
+    left: inherit;
+    width: inherit;
+    height: 20%;
 }
 
 #settingsHolder:hover .settings {
@@ -77,219 +38,12 @@ canvas {
 .settings {
     display: flex;
     flex-direction: column;
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+
+    font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
     color: white;
     visibility: visible;
     opacity: 0;
     padding: 10px;
-    background-color: rgba(25, 25, 25, 0.7);
-    transition: opacity 0.3s ease;
-}
-
-.dangerous-options {
-    display: none;
-    border-top: 1px solid rgba(255, 0, 0, 0.5);
-    margin-top: 10px;
-    padding-top: 10px;
-}
-
-.dangerous-options.revealed {
-    display: block;
-}
-
-#showDangerousBtn {
-    background-color: #6b0000;
-    color: white;
-    border: none;
-    padding: 5px 10px;
-    margin-top: 10px;
-    border-radius: 3px;
-    cursor: pointer;
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-    transition: background-color 0.3s;
-}
-
-#showDangerousBtn:hover {
-    background-color: #8a0000;
-}
-
-.size-control {
-    margin-bottom: 10px;
-}
-
-.size-control label {
-    display: inline-block;
-    margin-bottom: 3px;
-}
-
-input[type="range"] {
-    width: 100%;
-    margin: 5px 0;
-    -webkit-appearance: none;
-    height: 6px;
-    background: #555;
-    border-radius: 3px;
-    outline: none;
-}
-
-input[type="range"]::-webkit-slider-thumb {
-    -webkit-appearance: none;
-    appearance: none;
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background: #68a3e5;
-    cursor: pointer;
-}
-
-input[type="range"]::-moz-range-thumb {
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background: #68a3e5;
-    cursor: pointer;
-    border: none;
-}
-
-@media (max-width: 600px),
-(max-height: 600px) {
-    #settingsHolder {
-        display: none;
-    }
-
-    #showMenuBtn {
-        display: block !important;
-        font-size: 16px !important;
-        padding: 8px 12px !important;
-    }
-}
-
-@media (max-width: 400px),
-(max-height: 400px) {
-    #canvasContainer::before {
-        content: '';
-        display: none;
-    }
-
-    #showMenuBtn {
-        padding: 6px 10px !important;
-        font-size: 14px !important;
-    }
-}
-
-#playerSelect {
-    background-color: #333;
-    color: #fff;
-    border: 1px solid #555;
-    padding: 5px;
-    border-radius: 4px;
-    margin-left: 5px;
-    cursor: pointer;
-    min-width: 150px;
-    font-size: inherit;
-}
-
-#playerSelect:hover {
-    background-color: #444;
-}
-
-#playerSelect option {
-    background-color: #333;
-    color: #fff;
-    padding: 5px;
-}
-
-#playerSelect option:hover {
-    background-color: #444;
-}
-
-.player-focus {
-    margin-top: 10px;
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-}
-
-#hideMenuBtn {
-    background-color: #333;
-    color: white;
-    border: none;
-    padding: 8px 10px;
-    margin-top: 10px;
-    border-radius: 3px;
-    cursor: pointer;
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-    transition: background-color 0.3s;
-    width: 100%;
-    font-size: inherit;
-}
-
-#hideMenuBtn:hover {
-    background-color: #444;
-}
-
-#showMenuBtn {
-    position: fixed;
-    top: 10px;
-    left: 10px;
-    background-color: rgba(25, 25, 25, 0.9);
-    color: white;
-    border: none;
-    padding: 8px 12px;
-    border-radius: 15px;
-    font-size: 16px;
-    cursor: pointer;
-    z-index: 101;
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-    transition: opacity 0.3s;
-    opacity: 0.8;
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
-}
-
-#showMenuBtn:hover {
-    opacity: 1;
-}
-
-input[type="checkbox"] {
-    margin-right: 8px;
-}
-
-label {
-    cursor: pointer;
-    user-select: none;
-    margin-bottom: 2px;
-}
-
-.settings>div {
-    margin-bottom: 5px;
-    padding: 3px 0;
-}
-
-.touch-device input[type="checkbox"] {
-    transform: scale(1.3);
-    margin: 2px 10px 2px 2px;
-}
-
-.touch-device input[type="range"]::-webkit-slider-thumb {
-    width: 20px;
-    height: 20px;
-}
-
-.touch-device input[type="range"]::-moz-range-thumb {
-    width: 20px;
-    height: 20px;
-}
-
-.touch-device .settings>div {
-    padding: 6px 0;
-}
-
-@media (prefers-color-scheme: dark) {
-    #settingsHolder .settings {
-        background-color: rgba(15, 15, 15, 0.85);
-    }
-
-    #showMenuBtn {
-        background-color: rgba(15, 15, 15, 0.9);
-    }
+    background-color: rgba(25, 25, 25, 0.7); /* Semi-transparent white background */
+    transition: opacity 0.3s ease; /* Smooth transition */
 }

webradar/webstuff.js

@@ -1,25 +0,0 @@
-function toggleDangerousOptions() {
-    const dangerousSection = document.getElementById('dangerousOptions');
-    const button = document.getElementById('showDangerousBtn');
-
-    if (dangerousSection.classList.contains('revealed')) {
-        dangerousSection.classList.remove('revealed');
-        button.textContent = 'Show Dangerous Options';
-    } else {
-        dangerousSection.classList.add('revealed');
-        button.textContent = 'Hide Dangerous Options';
-    }
-}
-
-function toggleMenu(show) {
-    const settingsHolder = document.getElementById('settingsHolder');
-    const showMenuBtn = document.getElementById('showMenuBtn');
-
-    if (show) {
-        settingsHolder.style.display = 'block';
-        showMenuBtn.style.display = 'none';
-    } else {
-        settingsHolder.style.display = 'none';
-        showMenuBtn.style.display = 'block';
-    }
-}