add fix-bath-house-bribe-blunders 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/fix_bath_house_bribe_blunders ./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/
         mv target/i686-pc-windows-msvc/release/fix_market_hall_production_town.dll ./mods/

Cargo.toml

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

mod-fix-bath-house-bribe-blunders/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "mod-fix-bath-house-bribe-blunders"
+edition = "2021"
+version.workspace = true
+
+[lib]
+crate-type = ["cdylib"]
+name="fix_bath_house_bribe_blunders"
+
+[dependencies]
+log = { workspace = true }
+p3-api = { path = "../p3-api" }
+hooklet = { workspace = true }

mod-fix-bath-house-bribe-blunders/src/ffi.rs

@@ -0,0 +1,76 @@
+use std::{arch::global_asm, ffi::c_void};
+
+use hooklet::windows::x86::{deploy_rel32_raw, replace_slice_rwx, X86Rel32Type};
+use log::debug;
+use p3_api::{game_world::GAME_WORLD_PTR, mods};
+
+const COUNT_BRIBED_COUNCILLORS_PATCH_ADDRESS: u32 = 0x0053AC99;
+static COUNT_BRIBED_COUNCILLORS_CONTINUATION: u32 = 0x0053ACA6;
+
+#[no_mangle]
+pub unsafe extern "C" fn start() -> u32 {
+    mods::init_mod();
+
+    debug!("Properly set the councillor's briber to -1 if the bribe failed");
+    match replace_slice_rwx(0x0053AD85, &[0xc6, 0x01, 0xff]) {
+        Ok(_) => {}
+        Err(_) => return 1,
+    }
+
+    debug!("Reset annoyed councillors when opening the bath house");
+    match replace_slice_rwx(0x005B17B7, &[0x90, 0x90]) {
+        Ok(_) => {}
+        Err(_) => return 2,
+    }
+
+    debug!("Fix the limit of 2 bribed councillors");
+    match deploy_rel32_raw(
+        COUNT_BRIBED_COUNCILLORS_PATCH_ADDRESS,
+        (&count_bribed_councillors_detour) as *const _ as _,
+        X86Rel32Type::Jump,
+    ) {
+        Ok(_) => {}
+        Err(_) => return 3,
+    }
+
+    0
+}
+
+#[no_mangle]
+unsafe extern "thiscall" fn count_bribed_councillors(merchant_index: u8, town_index: u8) -> i32 {
+    debug!("count_bribed_councillors(merchant_index={merchant_index:#x}, town_index={town_index:#x})");
+    let town = GAME_WORLD_PTR.get_town(town_index);
+    let mut bribed = 0;
+    let bribers = town.get_councillor_bribes();
+    for briber in bribers {
+        if briber == merchant_index {
+            bribed += 1;
+        }
+    }
+
+    debug!("Found {bribed} local councillors already bribed by the merchant");
+    bribed
+}
+
+extern "C" {
+    static count_bribed_councillors_detour: c_void;
+}
+
+global_asm!("
+.global {count_bribed_councillors_detour}
+{count_bribed_councillors_detour}:
+# save regs except eax and edx (not read)
+push ecx
+
+push [esi+0x10]
+call {count_bribed_councillors}
+mov edi, eax
+
+# restore regs
+pop ecx
+
+jmp [{continuation}]
+",
+count_bribed_councillors_detour = sym count_bribed_councillors_detour,
+count_bribed_councillors = sym count_bribed_councillors,
+continuation = sym COUNT_BRIBED_COUNCILLORS_CONTINUATION);

mod-fix-bath-house-bribe-blunders/src/lib.rs

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

mod-trading-office-prices-synchronization/src/lib.rs

@@ -42,7 +42,7 @@ pub(crate) unsafe fn synchronize_autotrade_settings() {
             }
             let stock = stock[i];
             let price = setting_prices[i];
-            
+
             OPERATIONS_PTR.enqueue_operation(Operation::OfficeAutotradeSettingChange {
                 stock,
                 price,

p3-api/Cargo.toml

@@ -13,6 +13,7 @@ num-traits = "0.2"
 num-derive = "0.3"
 strum = { version = "0.24", features = ["derive"] }
 csbindgen = { version = "1.7.0", optional = true }
+win_dbg_logger = { workspace = true }
 
 [dev-dependencies]
 simple_logger = "4.1"

p3-api/src/lib.rs

@@ -8,6 +8,7 @@ pub mod facility;
 pub mod game_world;
 pub mod merchant;
 pub mod missions;
+pub mod mods;
 pub mod operation;
 pub mod operations;
 pub mod scheduled_tasks;

p3-api/src/mods.rs

@@ -0,0 +1,12 @@
+use std::panic;
+
+use log::error;
+
+pub unsafe fn init_mod() {
+    let _ = log::set_logger(&win_dbg_logger::DEBUGGER_LOGGER);
+    log::set_max_level(log::LevelFilter::Trace);
+
+    panic::set_hook(Box::new(|p| {
+        error!("{p}");
+    }));
+}

p3-api/src/town/mod.rs

@@ -49,6 +49,10 @@ impl TownPtr {
         unsafe { self.get(0x670) }
     }
 
+    pub fn get_councillor_bribes(&self) -> [u8; 4] {
+        unsafe { self.get(0x6dc) }
+    }
+
     pub unsafe fn get_first_office_index(&self) -> u16 {
         self.get(0x784)
     }