Parsing .DTm works a bit, old ui now renders .DTm map

dt_lib/src/battle/army.rs

@@ -19,7 +19,7 @@ use num::{integer::sqrt, pow};
 use once_cell::sync::Lazy;
 use pathfinding::directed::astar::astar;
 
-use super::control::Control;
+use super::control::{Control, PC_ControlSetings};
 #[derive(Clone, Debug, Default, Sections)]
 #[alkahest(Deserialize, Serialize, SerializeRef, Formula)]
 pub struct ArmyStats {
@@ -70,6 +70,7 @@ pub struct Army {
     pub defeated: bool,
     //#[default_value = "Control::PC"]
     pub control: Control,
+	pub pc_settings: Option<PC_ControlSetings>,
     //#[unused]
     pub path: Vec<(usize, usize)>,
 }
@@ -101,6 +102,7 @@ impl Army {
     ) -> Self {
         let hitmap: Vec<Option<usize>> = (0..*MAX_TROOPS).map(|_| None::<usize>).collect();
         let mut army = Army {
+			pc_settings: None,
             troops: Vec::new(),
             building: None,
             hitmap,
@@ -221,8 +223,8 @@ impl Army {
         Ok(())
     }
 
-    pub fn add_item(&mut self, item: usize) {
-        self.inventory.push(Item { index: item })
+    pub fn add_item(&mut self, item: Item) {
+        self.inventory.push(item)
     }
     pub fn remove_item(&mut self, rem_item: usize) {
         if let Some(index) = self
@@ -304,14 +306,14 @@ pub fn find_path(
             }
             .into_iter()
             .filter(|p: &(usize, usize)| {
-                let hitbox = &gamemap.hitmap[p.0][p.1];
+                let hitbox = &gamemap.hitmap[*p];
                 hitbox.passable()
                     && (!(hitbox.need_transport ^ on_transport)
                         || hitbox.building.is_some_and(|n| {
                             objects[gamemap.buildings[n].id].obj_type == ObjectType::Bridge
                         }))
             })
-            .map(|p| (p, 10 / TILES[gamemap.tilemap[p.0][p.1]].walkspeed))
+            .map(|p| (p, 10 / TILES[gamemap.tilemap[p]].walkspeed))
         },
         |&p| dist(&p, &goal),
         |&p| p == goal,

dt_lib/src/battle/control.rs

@@ -1,12 +1,15 @@
 use advini::{Ini, IniParseError};
 use alkahest::*;
+use math_thingies::Percent;
+
+use crate::time::time::Time;
 #[derive(Clone, Debug)]
 #[alkahest(Deserialize, Serialize, SerializeRef, Formula)]
 pub struct Relations {
-    player: u8,
-    ally: u8,
-    neighbour: u8,
-    enemy: u8,
+    pub player: u8,
+    pub ally: u8,
+    pub neighbour: u8,
+    pub enemy: u8,
 }
 impl Ini for Relations {
     fn eat(chars: std::str::Chars) -> Result<(Self, std::str::Chars), IniParseError> {
@@ -73,17 +76,27 @@ impl Ini for Control {
 }
 
 #[derive(Clone, Debug, Default)]
+#[alkahest(Deserialize, Serialize, SerializeRef, Formula)]
 pub struct PC_ControlSetings {
-    xp_like_player: bool,
-    xp_add: u64,
-    units_dont_have_money: bool,
-    ignores_ai_armys: bool,
-    targets_player: bool,
-    forbid_random_targets: bool,
-    forbid_random_talks: bool,
-    not_interested_in_buildings: bool,
-    patrol_radius: Option<u64>,
-    relations: Relations,
+    pub xp_like_player: bool,
+    pub xp_add: u64,
+	pub xp_correction: Percent,
+	pub gold_income: u64,
+	pub mana_income: u64,
+	pub speed_correction: Percent,
+    pub units_dont_have_money: bool,
+    pub ignores_ai_armys: bool,
+    pub targets_player: bool,
+    pub forbid_random_targets: bool,
+    pub forbid_random_talks: bool,
+    pub not_interested_in_buildings: bool,
+	pub aggression: u8,
+	pub patrol: u8,
+	pub revive_everyone: bool,
+	pub revive_time: Time,
+	pub garrison_power: u8,
+    pub patrol_radius: Option<u64>,
+    pub relations: Relations,
 }
 #[derive(Clone, Debug)]
 pub enum Target {

dt_lib/src/lib.rs

@@ -1,3 +1,4 @@
+#![allow(unused_imports)]
 pub mod battle;
 pub mod bonuses;
 pub mod effects;