~quf/tocs

4b2dd3ce9b26bb5be70678c69ebf7bf48ac240bf — Lukas Himbert 5 months ago 9804f01
algotable update
M sqlite_conv/src/main.rs => sqlite_conv/src/main.rs +3 -3
@@ 294,7 294,7 @@ fn scripts_to_new_db<P: AsRef<std::path::Path>>(base_path: P, dbpath: P) {
    cond_param_1 int,
    cond_param_2 int,
    cond_param_3 int,
    target_param int,
    do_not_move int,
    use_limit_after_retry int,
    unk6 int,
    foreign key(file_name) references scripts(file_name)


@@ 459,7 459,7 @@ fn insert_script_entry_data(tx: &rusqlite::Transaction, script_name: &str, entry
                cond_param_1,
                cond_param_2,
                cond_param_3,
                target_param,
                do_not_move,
                use_limit_after_retry,
                unk6,
            } in entries


@@ 478,7 478,7 @@ fn insert_script_entry_data(tx: &rusqlite::Transaction, script_name: &str, entry
                        &cond_param_1 as _,
                        &cond_param_2 as _,
                        &cond_param_3 as _,
                        &target_param as _,
                        &do_not_move as _,
                        &use_limit_after_retry as _,
                        &unk6 as _,
                    ] as &[_],

M sqlite_conv/util/algo_action.sql => sqlite_conv/util/algo_action.sql +1 -1
@@ 60,6 60,6 @@ select
  AlgoTable.chance,
  AlgoTable.use_limit,
  AlgoTable.target_priority,
  AlgoTable.target_param
  AlgoTable.do_not_move
from scripts.AlgoTable
;

M tocs/src/script/deser.rs => tocs/src/script/deser.rs +2 -2
@@ 240,7 240,7 @@ pub fn read_algo_table_entries(data: &[u8]) -> Option<std::vec::Vec<AlgoTableEnt
        let cond_param_1 = reader.read_u32_le()?;
        let cond_param_2 = reader.read_u32_le()?;
        let cond_param_3 = reader.read_u32_le()?;
        let target_param = reader.read_u32_le()?;
        let do_not_move = reader.read_u32_le()?;
        let use_limit_after_retry = reader.read_u32_le()?;
        let unk6 = reader.read_u32_le()?;



@@ 255,7 255,7 @@ pub fn read_algo_table_entries(data: &[u8]) -> Option<std::vec::Vec<AlgoTableEnt
            cond_param_1,
            cond_param_2,
            cond_param_3,
            target_param,
            do_not_move,
            use_limit_after_retry,
            unk6,
        });

M tocs/src/script/mod.rs => tocs/src/script/mod.rs +1 -1
@@ 102,7 102,7 @@ pub struct AlgoTableEntry {
    pub cond_param_1: u32,
    pub cond_param_2: u32,
    pub cond_param_3: u32,
    pub target_param: u32,
    pub do_not_move: u32,
    pub use_limit_after_retry: u32,
    pub unk6: u32,
}

M tocs/src/script/ser.rs => tocs/src/script/ser.rs +2 -2
@@ 207,7 207,7 @@ impl AlgoTableEntry {
            cond_param_1,
            cond_param_2,
            cond_param_3,
            target_param,
            do_not_move,
            use_limit_after_retry,
            unk6,
        } = self;


@@ 221,7 221,7 @@ impl AlgoTableEntry {
        writer.write_u32_le(*cond_param_1);
        writer.write_u32_le(*cond_param_2);
        writer.write_u32_le(*cond_param_3);
        writer.write_u32_le(*target_param);
        writer.write_u32_le(*do_not_move);
        writer.write_u32_le(*use_limit_after_retry);
        writer.write_u32_le(*unk6);
        Some(())