fix: change map addr offset to +384

Merge 'development' into 'main'

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "radarflow"
-version = "0.2.4"
+version = "0.2.5"
 authors = ["Janek S <development@superyu.xyz"]
 edition = "2021"
 
@@ -8,39 +8,39 @@ edition = "2021"
 
 [dependencies]
 # memory
-memflow = "0.2.1"
+memflow = "0.2.3"
 memflow-native = { git = "https://github.com/memflow/memflow-native" }
 dataview = "1.0.1"
 
 # logging
-log = "0.4.21"
+log = "0.4.22"
-simple_logger = "4.3.3"
+simple_logger = "5.0.0"
 
 # error handling
-anyhow = "1.0.81"
+anyhow = "1.0.93"
 
 # derive stuff
 enum-primitive-derive = "0.3.0"
-num-traits = "0.2.18"
+num-traits = "0.2.19"
-serde = { version = "1.0.197", features = ["derive"] }
+serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.115"
+serde_json = "1.0.133"
-clap = { version = "4.5.4", features = ["derive", "string"] }
+clap = { version = "4.5.21", features = ["derive", "string"] }
 
 # tokio
 tokio = { version = "1.37.0", features = ["full"] }
 
 # networking
-axum = { version = "0.7.5", features = ["ws"] }
+axum = { version = "0.7.9", features = ["ws"] }
-tower-http = { version = "0.5.2", features = ["fs"] }
+tower-http = { version = "0.6.2", features = ["fs"] }
-tower = "0.4.13"
+tower = "0.5.1"
-local-ip-address = "0.6.1"
+local-ip-address = "0.6.3"
 
 # other
-itertools = "0.12.1"
+itertools = "0.13.0"
 
 
 [build-dependencies]
-reqwest = { version = "0.12.2", features = ["blocking"] }
+reqwest = { version = "0.12.9", features = ["blocking"] }
-serde = { version = "1.0.197", features = ["derive"] }
+serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.115"
+serde_json = "1.0.133"
-vergen = { version = "8.3.1", features = ["build", "cargo", "git", "gitcl", "rustc", "si"] }
+vergen-gitcl = { version = "1.0.0", features = ["build", "cargo", "rustc",] }

build.rs

@@ -1,7 +1,7 @@
 use std::error::Error;
 
 use serde::{Deserialize, Serialize};
-use vergen::EmitBuilder;
+use vergen_gitcl::{Emitter, GitclBuilder};
 
 #[derive(Clone, Deserialize, Serialize)]
 struct InfoJson {
@@ -36,29 +36,27 @@ fn build_number() -> Result<(), Box<dyn Error>> {
 fn main() -> Result<(), Box<dyn Error>> {
 
     download(
-        "https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/client.dll.rs",
+        "https://raw.githubusercontent.com/a2x/cs2-dumper/refs/heads/main/output/client_dll.rs",
         "./src/dma/cs2dumper/client_mod.rs"
     ).expect("Failed to download build file \"client.dll.rs\"");
 
     download(
-        "https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/offsets.rs",
+        "https://raw.githubusercontent.com/a2x/cs2-dumper/refs/heads/main/output/offsets.rs",
         "./src/dma/cs2dumper/offsets_mod.rs"
     ).expect("Failed to download build file \"offsets.rs\"");
 
     download(
-        "https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/engine2.dll.rs",
+        "https://raw.githubusercontent.com/a2x/cs2-dumper/refs/heads/main/output/engine2_dll.rs",
         "./src/dma/cs2dumper/engine2_mod.rs"
     ).expect("Failed to download build file \"engine2.dll.rs\"");
 
     build_number()?;
 
-    EmitBuilder::builder()
+    let gitcl = GitclBuilder::all_git()?;
-        .git_sha(true)
+
-        .git_commit_date()
+
-        .cargo_debug()
+    Emitter::new()
-        .cargo_target_triple()
+        .add_instructions(&gitcl)?
-        .rustc_semver()
-        .rustc_llvm_version()
         .emit()?;
 
     Ok(())

src/cli.rs

@@ -45,7 +45,11 @@ fn version() -> String {
         avail.join(", ")
     };
 
-    format!(" {pkg_ver} (rev {git_hash})\nCommit Date: {commit_date}\nAvailable Connectors: {avail_cons}")
+    format!(
+        "{pkg_ver} (rev {git_hash})\n\
+        Commit Date: {commit_date}\n\
+        Available Connectors: {avail_cons}\n"
+    )
 }
 
 fn port_in_range(s: &str) -> Result<u16, String> {

src/comms.rs

@@ -77,16 +77,13 @@ pub struct RadarData {
     #[serde(rename(serialize = "entityData"))]
     player_data: Vec<EntityData>,
 
-    #[serde(rename = "triggerbot_shoot")]
-    triggerbot_shoot: 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, triggerbot_shoot: bool,) -> 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, triggerbot_shoot }
+        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
@@ -102,8 +99,7 @@ impl RadarData {
             bomb_exploded: false,
             bomb_being_defused: false,
             bomb_defuse_length: 0.0,
-            bomb_defuse_end: 0.0,
+            bomb_defuse_end: 0.0
-            triggerbot_shoot: false,
         }
     }
 }

src/dma/context/mod.rs

@@ -97,7 +97,6 @@ impl DmaCtx {
         let mut team = 0i32;
         let mut clipping_weapon = 0u64;
         let mut is_scoped = 0u8;
-        let mut crosshair_id = 0u8;
 
         {
             let mut batcher = MemoryViewBatcher::new(&mut self.process);
@@ -107,7 +106,6 @@ 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(pawn + cs2dumper::client::C_CSPlayerPawnBase::m_iIDEntIndex, &mut crosshair_id);
         }
     
         let team = TeamID::from_i32(team);
@@ -128,8 +126,7 @@ impl DmaCtx {
             team,
             health,
             has_awp,
-            is_scoped: is_scoped != 0,
+            is_scoped: is_scoped != 0
-            crosshair_id
         })
     }
 
@@ -255,5 +252,4 @@ pub struct BatchedPlayerData {
     pub health: u32,
     pub has_awp: bool,
     pub is_scoped: bool,
-    pub crosshair_id: u8,
 }

src/dma/mod.rs

@@ -220,8 +220,7 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
                 data.bomb_exploded,
                 data.bomb_being_defused,
                 data.bomb_defuse_length,
-                bomb_defuse_end,
+                bomb_defuse_end
-                local_data.crosshair_id != 0 && local_data.crosshair_id != 255
             );
         } else {
             let mut radar = radar_data.write().await;

src/dma/threaddata/mod.rs

@@ -21,7 +21,7 @@ pub struct CsData {
     // Common
     pub local: u64,
     pub local_pawn: u64,
-    pub is_dead: bool,
+    // pub is_dead: bool,   // TODO: Why is this here?
     pub tick_count: i32,
     pub freeze_period: bool,
     pub round_start_count: u8,
@@ -169,7 +169,7 @@ impl CsData {
         {
             // Globals
             let tick_count_addr = (self.globals + 0x40).into();
-            let map_addr = (self.globals + 0x188).into();
+            let map_addr = (self.globals + 384).into();
 
             // Gamerules
             let bomb_dropped_addr = (self.gamerules + cs2dumper::client::C_CSGameRules::m_bBombDropped as u64).into();
@@ -178,7 +178,7 @@ impl CsData {
             let round_start_count_addr = (self.gamerules + cs2dumper::client::C_CSGameRules::m_nRoundStartCount as u64).into();
 
             // Game Entity System
-            let highest_index_addr = (self.game_ent_sys + cs2dumper::offsets::client_dll::dwGameEntitySystem_getHighestEntityIndex as u64).into();
+            let highest_index_addr = (self.game_ent_sys + cs2dumper::offsets::client_dll::dwGameEntitySystem_highestEntityIndex as u64).into();
 
             let mut batcher = ctx.process.batcher();
             batcher.read_into(
@@ -237,7 +237,7 @@ impl CsData {
         }
 
 
-        let map_string = ctx.process.read_char_string_n(map_ptr.into(), 32).unwrap_or(String::from("<empty>"));
+        let map_string = ctx.process.read_utf8_lossy(map_ptr.into(), 32).unwrap_or(String::from("<empty>"));
 
         self.map = map_string;
         self.bomb_dropped = bomb_dropped != 0;

webradar/assets/json/de_nuke.json

@@ -3,6 +3,5 @@
   "pos_y": 2887.0,
   "scale": 7.0,
   "rotate": 0,
-  "zoom": 0.0,
+  "zoom": 0.0
-  "altitude_split": -495
 }

webradar/assets/json/de_vertigo.json

@@ -3,6 +3,5 @@
   "pos_y": 1762.0,
   "scale": 4.0,
   "rotate": 0,
-  "zoom": 0.0,
+  "zoom": 0.0
-  "altitude_split": 11700
 }

webradar/script.js

@@ -1,10 +1,7 @@
 // Colors
 const localColor = "#109856"
-const localLowerColor = "#064024"
 const teamColor = "#68a3e5"
-const teamLowerColor = "#2c4969"
 const enemyColor = "#ec040b"
-const enemyLowerColor = "#4f0002"
 const bombColor = "#eda338"
 const textColor = "#d1d1d1"
 
@@ -38,7 +35,7 @@ if (location.protocol == 'https:') {
 } else {
     websocketAddr = `ws://${window.location.host}/ws`
 }
-websocketAddr = "ws://192.168.0.235:8000/ws"
+//websocketAddr = "ws://192.168.0.235:8000/ws"
 
 // Util functions
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
@@ -157,30 +154,16 @@ function render() {
                     if (data.Bomb !== undefined) {
                         drawBomb(data.Bomb.pos, data.Bomb.isPlanted)
                     } else {
-                        let fillStyle = localLowerColor
+                        let fillStyle = localColor
 
-                        if (map && map.altitude_split && data.Player.pos.z < map.altitude_split) {
+                        switch (data.Player.playerType) {
+                            case "Team":
+                                fillStyle = teamColor
+                                break;
 
-                            switch (data.Player.playerType) {
+                            case "Enemy":
-                                case "Team":
+                                fillStyle = enemyColor
-                                    fillStyle = teamLowerColor
+                                break;
-                                    break;
-    
-                                case "Enemy":
-                                    fillStyle = enemyLowerColor
-                                    break;
-                            }
-                        } else {
-                            fillStyle = localColor
-                            switch (data.Player.playerType) {
-                                case "Team":
-                                    fillStyle = teamColor
-                                    break;
-    
-                                case "Enemy":
-                                    fillStyle = enemyColor
-                                    break;
-                            }
                         }
 
                         drawEntity(