Add debug_navpoint_matrix mod

Author: Trolldemorted

.github/workflows/release.yml

@@ -14,6 +14,7 @@ jobs:
     - run: cargo build --release
     - run: |
         mkdir mods
+        mv target/i686-pc-windows-msvc/release/debug_navpoint_matrix.dll ./mods/
         mv target/i686-pc-windows-msvc/release/fix_bath_house_bribe_blunders.dll ./mods/
         mv target/i686-pc-windows-msvc/release/fix_damage_to_offside_ship_artillery.dll ./mods/
         mv target/i686-pc-windows-msvc/release/fix_invulnerable_ship_artillery_slots.dll ./mods/

Cargo.toml

@@ -4,6 +4,7 @@ resolver = "2"
 members = [
     "aimcli",
     "cprcli",
+    "mod-debug-navpoint-matrix",
     "mod-fix-bath-house-bribe-blunders",
     "mod-fix-damage-to-offside-ship-artillery",
     "mod-fix-invulnerable-ship-artillery-slots",

mod-debug-navpoint-matrix/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "mod-debug-navpoint-matrix"
+edition = "2021"
+version.workspace = true
+
+[lib]
+crate-type = ["cdylib"]
+name="debug_navpoint_matrix"
+
+[dependencies]
+log = { workspace = true }
+p3-api = { path = "../p3-api" }
+hooklet = { workspace = true }

mod-debug-navpoint-matrix/src/ffi.rs

@@ -0,0 +1,51 @@
+use std::{
+    mem,
+    sync::atomic::{AtomicPtr, Ordering},
+};
+
+use hooklet::windows::x86::{hook_call_rel32, CallRel32Hook};
+use log::debug;
+use p3_api::{class35::Class35Ptr, data::ddraw_set_constant_color, mods, ui::draw_geometry_abs};
+
+static DRAW_NAVIGATION_LINE_HOOK_PTR: AtomicPtr<CallRel32Hook> = AtomicPtr::new(std::ptr::null_mut());
+const STROKE_LENGTH: i32 = 4;
+
+#[no_mangle]
+unsafe extern "C" fn start() -> u32 {
+    mods::init_mod();
+
+    debug!("Deploying draw_navigation_line hook");
+    match hook_call_rel32(0x4AE38, draw_line_hook as usize as u32) {
+        Ok(hook) => {
+            DRAW_NAVIGATION_LINE_HOOK_PTR.store(Box::into_raw(Box::new(hook)), Ordering::SeqCst);
+        }
+        Err(_) => return 1,
+    }
+
+    0
+}
+
+#[no_mangle]
+unsafe extern "thiscall" fn draw_line_hook(this: u32, screen_rectangle: u32) {
+    let class35 = Class35Ptr::new();
+    ddraw_set_constant_color(0xffcc0000);
+    for i in 0..class35.get_nav_vec_count() {
+        let point = class35.get_nav_vec_entry(i as _);
+        let x = nav_vec_coord_to_game_coord(point.0 as _);
+        let y = nav_vec_coord_to_game_coord(point.1 as _);
+        draw_marker(x, y);
+    }
+
+    let orig_address = (*DRAW_NAVIGATION_LINE_HOOK_PTR.load(Ordering::SeqCst)).old_absolute;
+    let orig: extern "thiscall" fn(this: u32, screen_rectangle: u32) = unsafe { mem::transmute(orig_address) };
+    orig(this, screen_rectangle)
+}
+
+unsafe fn draw_marker(x: i32, y: i32) {
+    draw_geometry_abs(x - STROKE_LENGTH, y - STROKE_LENGTH, x + STROKE_LENGTH, y + STROKE_LENGTH);
+    draw_geometry_abs(x - STROKE_LENGTH, y + STROKE_LENGTH, x + STROKE_LENGTH, y - STROKE_LENGTH);
+}
+
+fn nav_vec_coord_to_game_coord(i: i32) -> i32 {
+    (26 * i + 487) * 17 / 125
+}

mod-debug-navpoint-matrix/src/lib.rs

@@ -0,0 +1 @@
+pub(crate) mod ffi;

navpointmatrixcli/README.md

@@ -2,7 +2,7 @@
 
 ## Build Connected Nodes
 - `cargo run --bin navpointmatrixcli -- connected-nodes-from-navpoint-matrix --input "C:\Users\Benni\Patrician 3_workbench\navdata\matrix_int.dat"  --output ./connected_nodes.navpointmatrix.dat`
-- `cargo run --bin navpointmatrixcli -- connected-nodes-from-navigation-data --navigation-matrix "C:\Users\Benni\Patrician 3_workbench\navdata\nav_matrix.dat" --navigation-vector "C:\Users\Benni\Patrician 3_workbench\navdata\nav_vec.dat" --output ./connected_nodes.navpointdata.dat`
+- `cargo run --bin navpointmatrixcli -- connected-nodes-from-navigation-data --navigation-matrix "C:\Users\Benni\Patrician 3_workbench\navdata\nav_matrix.dat" --navigation-vector "C:\Users\Benni\Patrician 3_workbench\navdata\nav_vec.dat" --calculation-mode bresenham-line --output ./connected_nodes.navpointdata.dat`
 
 ## Build Navpoint Matrix
 - `cargo run --release --bin navpointmatrixcli -- navpoint-matrix --navigation-vector "C:\Users\Benni\Patrician 3_workbench\navdata\nav_vec.dat" --connected-nodes .\connected_nodes.navpointmatrix.dat --output ./matrix_int.dat`

p3-api/src/class35.rs

@@ -97,6 +97,15 @@ impl Class35Ptr {
         Self { address: *CLASS35_PTR_ADDRESS }
     }
 
+    pub unsafe fn get_nav_vec_entry(&self, offset: usize) -> (i16, i16) {
+        let ptr: *const i16 = self.get(0x0c);
+        (*ptr.add(2 * offset), *ptr.add(2 * offset + 1))
+    }
+
+    pub unsafe fn get_nav_vec_count(&self) -> i16 {
+        self.get(0x1c)
+    }
+
     pub unsafe fn calculate_town_route(&self, source: TownId, destination: TownId) -> Option<ShipRoutePtr> {
         let source_data = StaticTownDataPtr::new(source);
         let destination_data = StaticTownDataPtr::new(destination);

p3-api/src/missions/alderman_missions.rs

@@ -77,7 +77,7 @@ impl FoundTownPtr {
         let mut wares = vec![];
         let raw = self.get_production_effective_raw();
         for i in 0..17 {
-            if raw & 1 << i != 0 {
+            if raw & (1 << i) != 0 {
                 wares.push(FacilityId::from_usize(i + 4).unwrap());
             }
         }

p3-api/src/ui/class37.rs

@@ -20,11 +20,19 @@ impl Class37Ptr {
         }
     }
 
-    pub fn get_x(&self) -> i16 {
+    pub fn get_x(&self) -> i32 {
+        unsafe { self.get(0x14) }
+    }
+
+    pub fn get_y(&self) -> i32 {
+        unsafe { self.get(0x18) }
+    }
+
+    pub fn get_offset_x(&self) -> i16 {
         unsafe { self.get(0x29e4) }
     }
 
-    pub fn get_y(&self) -> i16 {
+    pub fn get_offset_y(&self) -> i16 {
         unsafe { self.get(0x29e6) }
     }
 }

p3-api/src/ui/ddraw.rs

@@ -0,0 +1,6 @@
+use std::mem;
+
+pub fn ddraw_sgl_draw_line(x1: f32, y1: f32, x2: f32, y2: f32) {
+    let function: extern "cdecl" fn(x1: f32, y1: f32, x2: f32, y2: f32) = unsafe { mem::transmute(0x004BB390) };
+    function(x1, y1, x2, y2)
+}