zhanshi/mekhanoidy-tools
1
0
Fork 0
mirror of https://github.com/aimrebirth/tools.git synced 2026-04-15 01:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix overwriting already patched files (scripts and mmo).

Browse source
This commit is contained in:
lzwdgc 2024-04-03 12:24:48 +03:00
parent 21a14caf12
commit 94f9125d5e
1 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/aim1_mod_maker/aim1_mod_maker.h
View file

@ -139,6 +139,7 @@ struct mod_maker {
std::set<path> files_to_distribute; std::set<path> files_to_distribute;
std::set<path> code_files_to_distribute; std::set<path> code_files_to_distribute;
std::set<path> restored_files; std::set<path> restored_files;
std::set<path> copied_files;
std::source_location loc; std::source_location loc;
mod_maker(std::source_location loc = std::source_location::current()) : loc{loc} { mod_maker(std::source_location loc = std::source_location::current()) : loc{loc} {
@ -161,7 +162,7 @@ struct mod_maker {
run_p4_tool("script2txt", p); run_p4_tool("script2txt", p);
} }
auto dst_txt = get_mod_dir() / txt.filename(); auto dst_txt = get_mod_dir() / txt.filename();
fs::copy_file(txt, dst_txt, fs::copy_options::overwrite_existing); copy_file_once(txt, dst_txt);
txt = dst_txt; txt = dst_txt;
replace_in_file_raw(txt, from, to); replace_in_file_raw(txt, from, to);
run_p4_tool("txt2script", txt); run_p4_tool("txt2script", txt);
@ -264,9 +265,6 @@ struct mod_maker {
} }
void insert(path fn, uint32_t offset, const byte_array &data) { void insert(path fn, uint32_t offset, const byte_array &data) {
files_to_pak.insert(find_real_filename(fn)); files_to_pak.insert(find_real_filename(fn));
if (is_already_inserted(fn, data)) {
return;
}
log("inserting into {} offset 0x{:08X} {} bytes", fn.string(), offset, data.size()); log("inserting into {} offset 0x{:08X} {} bytes", fn.string(), offset, data.size());
@ -276,8 +274,6 @@ struct mod_maker {
memmove(f.p + offset + data.size(), f.p + offset, f.sz - offset); memmove(f.p + offset + data.size(), f.p + offset, f.sz - offset);
::memcpy(f.p + offset, data.data(), data.size()); ::memcpy(f.p + offset, data.data(), data.size());
f.close(); f.close();
write_file(get_hash_fn(fn, data), ""s);
} }
std::string add_map_good(path mmo_fn, const std::string &building_name, const std::string &after_good_name, const mmo_storage2::map_good &mg) { std::string add_map_good(path mmo_fn, const std::string &building_name, const std::string &after_good_name, const mmo_storage2::map_good &mg) {
byte_array data((uint8_t*)&mg, (uint8_t*)&mg + sizeof(mg)); byte_array data((uint8_t*)&mg, (uint8_t*)&mg + sizeof(mg));
@ -286,9 +282,6 @@ struct mod_maker {
} }
void add_map_good(path mmo_fn, const std::string &building_name, const std::string &after_good_name, const byte_array &data) { void add_map_good(path mmo_fn, const std::string &building_name, const std::string &after_good_name, const byte_array &data) {
files_to_pak.insert(find_real_filename(mmo_fn)); files_to_pak.insert(find_real_filename(mmo_fn));
if (is_already_inserted(mmo_fn, data)) {
return;
}
auto fn = find_real_filename(mmo_fn); auto fn = find_real_filename(mmo_fn);
mmo_storage2 m; mmo_storage2 m;
@ -478,8 +471,6 @@ struct mod_maker {
return w; return w;
} }
} }
private:
db2::files::db2_internal &open_aim2_db() { db2::files::db2_internal &open_aim2_db() {
if (!aim2_available()) { if (!aim2_available()) {
throw std::runtime_error{"aim2 is not available, setup it first"}; throw std::runtime_error{"aim2 is not available, setup it first"};
@ -487,6 +478,13 @@ private:
static auto m2 = db2{aim2_game_dir / "data" / "db", 1251}.open().to_map(); static auto m2 = db2{aim2_game_dir / "data" / "db", 1251}.open().to_map();
return m2; return m2;
} }
private:
void copy_file_once(const path &from, const path &to) {
if (auto [_, i] = copied_files.emplace(to); i) {
fs::copy_file(from, to, fs::copy_options::overwrite_existing);
}
}
db2::files::db2_internal &open_aim2_quest() { db2::files::db2_internal &open_aim2_quest() {
if (!aim2_available()) { if (!aim2_available()) {
throw std::runtime_error{"aim2 is not available, setup it first"}; throw std::runtime_error{"aim2 is not available, setup it first"};
@ -524,22 +522,6 @@ private:
restored_files.insert(fn); restored_files.insert(fn);
} }
} }
path get_hash_fn(path fn, const byte_array &data) const {
return get_mod_dir() / std::format("{:0X}.hash", get_insert_hash(fn, data));
}
size_t get_insert_hash(path fn, const byte_array &data) const {
auto s = fn.wstring();
boost::to_lower(s);
fn = s;
size_t hash{};
boost::hash_combine(hash, fn);
boost::hash_combine(hash, data);
return hash;
}
bool is_already_inserted(path fn, const byte_array &data) const {
return fs::exists(get_hash_fn(fn,data));
}
void init(const path &dir) { void init(const path &dir) {
read_name(); read_name();
detect_game_dir(dir); detect_game_dir(dir);
@ -706,7 +688,7 @@ FF D7 ; call edi
)"_bin); )"_bin);
memcpy(ptr, make_insn_with_address("e9"_bin, -(ptr - f.p - aim_exe_v1_06_constants::trampoline_base_real - jumppad.size()))); memcpy(ptr, make_insn_with_address("e9"_bin, -(ptr - f.p - aim_exe_v1_06_constants::trampoline_base_real - jumppad.size())));
} }
path find_real_filename(path fn) const { path find_real_filename(path fn) {
auto s = fn.wstring(); auto s = fn.wstring();
boost::to_lower(s); boost::to_lower(s);
fn = s; fn = s;
@ -743,9 +725,7 @@ FF D7 ; call edi
throw SW_RUNTIME_ERROR("Cannot find file in archives: "s + fn.string()); throw SW_RUNTIME_ERROR("Cannot find file in archives: "s + fn.string());
} }
auto dst = get_mod_dir() / p.filename(); auto dst = get_mod_dir() / p.filename();
if (!fs::exists(dst)) { copy_file_once(p, dst);
fs::copy_file(p, dst);
}
return dst; return dst;
} }
default: default: