don't display when mission selected, display wares

Author: Trolldemorted

mod-town-hall-details/src/pages/aldermans_office.rs

@@ -1,9 +1,11 @@
 use std::ffi::{CStr, CString};
 
+use log::warn;
 use p3_api::{
     data::{ddraw_set_constant_color, ui_render_text_at},
     game_world::GAME_WORLD_PTR,
     missions::alderman_missions::{AldermanMissionDataPtr, FoundTownPtr},
+    operations::OPERATIONS_PTR,
     scheduled_tasks::{scheduled_task::ScheduledTaskData, SCHEDULED_TASKS_PTR},
     ui::{
         font::{self, get_normal_font},
@@ -16,13 +18,18 @@ static TASK_RESCHEDULING_IN: &CStr = c"Rescheduling in";
 static TASK_RESCHEDULES_REMAINING: &CStr = c"Reschedule Counter";
 static TOWN: &CStr = c"Town";
 static EFFECTIVE_PRODUCTION: &CStr = c"Effective Production";
+static INEFFECTIVE_PRODUCTION: &CStr = c"Ineffective Production";
 
 pub(crate) unsafe fn draw_page(window: UITownHallWindowPtr) {
     let next_mission_index = window.get_next_mission_index();
     if next_mission_index == 0 {
         return;
     }
 
+    if SCHEDULED_TASKS_PTR.get_merchant_alderman_mission_task_index(OPERATIONS_PTR.get_player_merchant_index()) != -1 {
+        return;
+    }
+
     let selected_mission_index = window.get_selected_alderman_mission_index();
     if selected_mission_index == 0xff {
         return;
@@ -72,6 +79,7 @@ pub(crate) unsafe fn draw_page(window: UITownHallWindowPtr) {
 
 unsafe fn render_aldermans_office_modifications_found_town(window: UITownHallWindowPtr, data: &FoundTownPtr) {
     let town = data.get_town();
+    let effective_raw = data.get_production_effective_raw();
     let effective = data.get_production_effective();
     let x = window.get_x();
     let mut y = window.get_y() + 100;
@@ -88,10 +96,48 @@ unsafe fn render_aldermans_office_modifications_found_town(window: UITownHallWin
     font::ddraw_set_text_mode(font::TextMode::AlignRight);
     let mut effective_string = String::new();
     for facility in effective {
-        effective_string.push_str(&format!("{facility:?}, "));
+        match facility {
+            p3_api::data::enums::FacilityId::Militia => warn!("Unexpected facility {facility:?}"),
+            p3_api::data::enums::FacilityId::Shipyard => warn!("Unexpected facility {facility:?}"),
+            p3_api::data::enums::FacilityId::Construction => warn!("Unexpected facility {facility:?}"),
+            p3_api::data::enums::FacilityId::Weaponsmith => warn!("Unexpected facility {facility:?}"),
+            p3_api::data::enums::FacilityId::HuntingLodge => effective_string.push_str("Skins, "),
+            p3_api::data::enums::FacilityId::FishermansHouse => {
+                if effective_raw & 0x20000 != 0 {
+                    effective_string.push_str("Whale Oil, ")
+                } else {
+                    effective_string.push_str("Fish, ")
+                }
+            }
+            p3_api::data::enums::FacilityId::Brewery => effective_string.push_str("Beer, "),
+            p3_api::data::enums::FacilityId::Workshop => effective_string.push_str("Iron Goods, "),
+            p3_api::data::enums::FacilityId::Apiary => effective_string.push_str("Honey, "),
+            p3_api::data::enums::FacilityId::GrainFarm => effective_string.push_str("Grain, "),
+            p3_api::data::enums::FacilityId::CattleFarm => effective_string.push_str("Meat, Leather, "),
+            p3_api::data::enums::FacilityId::Sawmill => effective_string.push_str("Timber, "),
+            p3_api::data::enums::FacilityId::WeavingMill => effective_string.push_str("Cloth, "),
+            p3_api::data::enums::FacilityId::Saltery => effective_string.push_str("Salt, "),
+            p3_api::data::enums::FacilityId::Ironsmelter => effective_string.push_str("Pig Iron, "),
+            p3_api::data::enums::FacilityId::SheepFarm => effective_string.push_str("Wool, "),
+            p3_api::data::enums::FacilityId::Vineyard => effective_string.push_str("Wine, "),
+            p3_api::data::enums::FacilityId::Pottery => effective_string.push_str("Pottery, "),
+            p3_api::data::enums::FacilityId::Brickworks => effective_string.push_str("Bricks, "),
+            p3_api::data::enums::FacilityId::Pitchmaker => effective_string.push_str("Pitch, "),
+            p3_api::data::enums::FacilityId::HempFarm => effective_string.push_str("Hemp, "),
+        }
     }
     effective_string.pop();
     effective_string.pop();
     let effective_cstring = CString::new(effective_string).unwrap();
     ui_render_text_at(x + COL_OFFSETS[1], y, effective_cstring.to_bytes());
+    y += 20;
+
+    font::ddraw_set_text_mode(font::TextMode::AlignLeft);
+    ui_render_text_at(x + COL_OFFSETS[0], y, INEFFECTIVE_PRODUCTION.to_bytes());
+
+    font::ddraw_set_text_mode(font::TextMode::AlignRight);
+    let mut ineffective_string = String::new();
+    if effective_raw & 0x20000 != 0 {
+        ineffective_string.push_str("Fish")
+    }
 }

mod-town-hall-details/src/pages/details.rs

@@ -79,14 +79,22 @@ pub(crate) unsafe fn draw_page(window: UITownHallWindowPtr) {
 
     let mut effective_prods_count = 0;
     font::ddraw_set_font(font::get_normal_font());
+    let mut has_meat_or_leather = false;
     for data in &hanse_data {
         let ware = WareId::from_usize(data.ware).unwrap();
         let ratio = data.get_ratio();
         if data.total_consumption < 1024 {
             ddraw_set_constant_color(0xFFD3D3D3);
         } else if effective_prods_count < 3 {
             ddraw_set_constant_color(0xFF7CFC00);
-            effective_prods_count += 1;
+            if ware == WareId::Meat || ware == WareId::Leather {
+                if !has_meat_or_leather {
+                    effective_prods_count += 1;
+                    has_meat_or_leather = true;
+                }
+            } else {
+                effective_prods_count += 1;
+            }
         } else {
             ddraw_set_constant_color(0xFF000000);
         }

p3-api/src/data/enums.rs

@@ -54,7 +54,6 @@ pub enum FacilityId {
     Brickworks = 0x12,
     Pitchmaker = 0x13,
     HempFarm = 0x14,
-    FishermansHouseWhale = 0xff,
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, EnumIter, EnumString, FromPrimitive)]

p3-api/src/operations.rs

@@ -2,10 +2,38 @@ use std::mem::transmute;
 
 use log::debug;
 
-use crate::operation::Operation;
+use crate::{data::p3_ptr::P3Pointer, operation::Operation};
 
+const OPERATIONS_ADDRESS: u32 = 0x006DF2F0;
+pub const OPERATIONS_PTR: OperationsPtr = OperationsPtr::new();
 const EXECUTE_OPERATION_ADDRESS: u32 = 0x00535760;
-//const STATIC_OPERATIONS_ADDRESS: u32 = 0x006DF2F0;
+
+#[derive(Clone, Debug, Copy)]
+pub struct OperationsPtr {
+    pub address: u32,
+}
+
+impl Default for OperationsPtr {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl OperationsPtr {
+    pub const fn new() -> Self {
+        Self { address: OPERATIONS_ADDRESS }
+    }
+
+    pub unsafe fn get_player_merchant_index(&self) -> i32 {
+        self.get(0x0924)
+    }
+}
+
+impl P3Pointer for OperationsPtr {
+    fn get_address(&self) -> u32 {
+        self.address
+    }
+}
 
 pub fn execute_operation(op: &Operation) {
     debug!("execute_operation({:?})", op);

p3-api/src/scheduled_tasks/mod.rs

@@ -1,3 +1,5 @@
+use std::mem;
+
 use scheduled_task::{ScheduledTaskPtr, SCHEDULED_TASK_SIZE};
 
 use crate::data::p3_ptr::P3Pointer;
@@ -6,7 +8,7 @@ pub mod scheduled_task;
 const SCHEDULED_TASKS_ADDRESS: u32 = 0x006DD73C;
 pub const SCHEDULED_TASKS_PTR: ScheduledTasksPtr = ScheduledTasksPtr::new();
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Copy)]
 pub struct ScheduledTasksPtr {
     pub address: u32,
 }
@@ -28,6 +30,11 @@ impl ScheduledTasksPtr {
         let base_address: u32 = unsafe { self.get(0x00) };
         ScheduledTaskPtr::new(base_address + index as u32 * SCHEDULED_TASK_SIZE)
     }
+
+    pub unsafe fn get_merchant_alderman_mission_task_index(&self, merchant_index: i32) -> i16 {
+        let func: extern "thiscall" fn(scheduled_tasks: u32, merchant_index: i32) -> i16 = mem::transmute(0x004EC694);
+        func(self.address, merchant_index)
+    }
 }
 
 impl P3Pointer for ScheduledTasksPtr {