[mod] Setup aim2 path. Better db handling.

examples/mods/aim1_community_fix/my_mod.cpp

@@ -61,10 +61,12 @@ int main(int argc, char *argv[]) {
 #else
         "test_mod"s
 #endif
-        + "-0.0.4"s
+        + "-0.0.5"s
     );
     mod.add_code_file_for_archive(INJECTIONS_FILE_NAME);
     mod.add_code_file_for_archive(AIM_TYPES_FILE_NAME);
+    // this mod uses aim2 files (copy finder from there), so we must set up its path
+    mod.setup_aim2_path();
     mod.files_to_distribute.insert("language_switcher.exe");
 
     // patch note: === LIST OF CHANGES ===
@@ -135,52 +137,52 @@ int main(int argc, char *argv[]) {
 
     // patch note: Database Changes
     // patch note: DB
-    auto db = mod.db().open();
+    auto db = mod.db();
     // patch note: set glider GL_S3_PS_FINDER2 model to MOD_GL_S3_PS_FINDER2 (lz)
-    db(u8"Ãëàéäåðû", "GL_S3_PS_FINDER2", "MODEL") = "MOD_GL_S3_PS_FINDER2";
+    db[u8"Ãëàéäåðû"]["GL_S3_PS_FINDER2"]["MODEL"] = "MOD_GL_S3_PS_FINDER2";
     // patch note: change MOD_GL_S3_PS_FINDER2 model radius to MOD_GL_S3_PS_FINDER1 radius (lz)
     // TODO: copy from aim2 db
-    db(u8"Ìîäåëè", "MOD_GL_S3_PS_FINDER2", "RADIUS") = 4.768386f; // from aim2;
+    db[u8"Ìîäåëè"]["MOD_GL_S3_PS_FINDER2"]["RADIUS"] = 4.768386f; // from aim2;
     //
-    db(u8"Òåêñòóðû", "TEX_GL_S3_PS_FINDER_2", "TYPE") = 0;
+    db[u8"Òåêñòóðû"]["TEX_GL_S3_PS_FINDER_2"]["TYPE"] = 0;
-    db(u8"Òåêñòóðû", "TEX_GL_S3_PS_FINDER_2", "COLOR") = 406137896;
+    db[u8"Òåêñòóðû"]["TEX_GL_S3_PS_FINDER_2"]["COLOR"] = 406137896;
-    db(u8"Òåêñòóðû", "TEX_GL_S3_PS_FINDER_2", "FILENAME") = "Data\\TM\\TEX_GL_S3_PS_FINDER_2.TM";
+    db[u8"Òåêñòóðû"]["TEX_GL_S3_PS_FINDER_2"]["FILENAME"] = "Data\\TM\\TEX_GL_S3_PS_FINDER_2.TM";
-    db(u8"Òåêñòóðû", "TEX_GL_S3_PS_FINDER_2_SPEC", "TYPE") = 0;
+    db[u8"Òåêñòóðû"]["TEX_GL_S3_PS_FINDER_2_SPEC"]["TYPE"] = 0;
-    db(u8"Òåêñòóðû", "TEX_GL_S3_PS_FINDER_2_SPEC", "COLOR") = 2631463;
+    db[u8"Òåêñòóðû"]["TEX_GL_S3_PS_FINDER_2_SPEC"]["COLOR"] = 2631463;
-    db(u8"Òåêñòóðû", "TEX_GL_S3_PS_FINDER_2_SPEC", "FILENAME") = "Data\\TM\\TEX_GL_S3_PS_FINDER_2_SPEC.TM";
+    db[u8"Òåêñòóðû"]["TEX_GL_S3_PS_FINDER_2_SPEC"]["FILENAME"] = "Data\\TM\\TEX_GL_S3_PS_FINDER_2_SPEC.TM";
-    db(u8"Òåêñòóðû", "TEX_GL_S3_PS_FINDER_2_SPEC_1", "TYPE") = 0;
+    db[u8"Òåêñòóðû"]["TEX_GL_S3_PS_FINDER_2_SPEC_1"]["TYPE"] = 0;
-    db(u8"Òåêñòóðû", "TEX_GL_S3_PS_FINDER_2_SPEC_1", "COLOR") = 1842204;
+    db[u8"Òåêñòóðû"]["TEX_GL_S3_PS_FINDER_2_SPEC_1"]["COLOR"] = 1842204;
-    db(u8"Òåêñòóðû", "TEX_GL_S3_PS_FINDER_2_SPEC_1", "FILENAME") = "Data\\TM\\TEX_GL_S3_PS_FINDER_2_SPEC_1.TM";
+    db[u8"Òåêñòóðû"]["TEX_GL_S3_PS_FINDER_2_SPEC_1"]["FILENAME"] = "Data\\TM\\TEX_GL_S3_PS_FINDER_2_SPEC_1.TM";
     // patch note: double gun for config CFG_NARGOON (double electro discharge) (lz)
-    auto tblcfg = db(u8"Êîíôèãóðàöèè");
+    auto &tblcfg = db[u8"Êîíôèãóðàöèè"];
-    tblcfg("CFG_NARGOON", "HEAVYGUN1") = "GUN_ELECTRO_DISCHARGER";
+    tblcfg["CFG_NARGOON"]["HEAVYGUN1"] = "GUN_ELECTRO_DISCHARGER";
     // patch note: double gun for config CFG_NARGOON1 (double two-barreled atomic gun) (lz)
-    tblcfg("CFG_NARGOON1", "HEAVYGUN1") = "GUN_DOUBLE_BARRELED_ATOMIC_GUN";
+    tblcfg["CFG_NARGOON1"]["HEAVYGUN1"] = "GUN_DOUBLE_BARRELED_ATOMIC_GUN";
     // patch note: double gun for config CFG_BASE_NARG - Nargoon (double two-barreled atomic gun) (lz)
-    tblcfg("CFG_BASE_NARG", "HEAVYGUN1") = "GUN_DOUBLE_BARRELED_ATOMIC_GUN";
+    tblcfg["CFG_BASE_NARG"]["HEAVYGUN1"] = "GUN_DOUBLE_BARRELED_ATOMIC_GUN";
     // patch note: double gun for config CFG_STNAR-97 - Nargoon (double GUN_INFRAATOMIC_PLASMA_GUN) (lz)
-    tblcfg("CFG_STNAR-97", "HEAVYGUN1") = "GUN_INFRAATOMIC_PLASMA_GUN";
+    tblcfg["CFG_STNAR-97"]["HEAVYGUN1"] = "GUN_INFRAATOMIC_PLASMA_GUN";
     // patch note: double gun for config CFG_FINDER_1 (std.3): from GUN_MICROWAVE_OSCILLATOR (std.4) and GUN_CHAOS_GENERATOR (std.4) to double GUN_FOUR_BARRELED_IMP_GAZER (std.3) (lz)
-    auto finder1 = tblcfg("CFG_FINDER_1");
+    auto &finder1 = tblcfg["CFG_FINDER_1"];
-    finder1("LIGHTGUN1") = "GUN_FOUR_BARRELED_IMP_GAZER";
+    finder1["LIGHTGUN1"] = "GUN_FOUR_BARRELED_IMP_GAZER";
-    finder1("HEAVYGUN1") = "GUN_FOUR_BARRELED_IMP_GAZER";
+    finder1["HEAVYGUN1"] = "GUN_FOUR_BARRELED_IMP_GAZER";
     // patch note: double gun for config CFG_FINDER_2: from GUN_FOUR_BARRELED_IMP_GAZER (std.3) + GUN_POZITRON_EMITTER (std.4) to double GUN_TACHYON_HEATER (std.3) (lz)
-    auto finder2 = tblcfg("CFG_FINDER_2");
+    auto &finder2 = tblcfg["CFG_FINDER_2"];
-    finder2("LIGHTGUN1") = "GUN_TACHYON_HEATER";
+    finder2["LIGHTGUN1"] = "GUN_TACHYON_HEATER";
-    finder2("HEAVYGUN1") = "GUN_TACHYON_HEATER";
+    finder2["HEAVYGUN1"] = "GUN_TACHYON_HEATER";
     // patch note: double gun for config CFG_EYEDSTONE_1: from GUN_FAST_ELECTROMAGNETIC_BEAM to double GUN_FAST_ELECTROMAGNETIC_BEAM (lz)
-    tblcfg("CFG_EYEDSTONE_1", "LIGHTGUN1") = "GUN_FAST_ELECTROMAGNETIC_BEAM";
+    tblcfg["CFG_EYEDSTONE_1"]["LIGHTGUN1"] = "GUN_FAST_ELECTROMAGNETIC_BEAM";
     // patch note: double gun for config CFG_EYEDSTONE_2: from GUN_FAST_ELECTROMAGNETIC_BEAM to double GUN_FAST_ELECTROMAGNETIC_BEAM (lz)
-    tblcfg("CFG_EYEDSTONE_2", "LIGHTGUN1") = "GUN_FAST_ELECTROMAGNETIC_BEAM";
+    tblcfg["CFG_EYEDSTONE_2"]["LIGHTGUN1"] = "GUN_FAST_ELECTROMAGNETIC_BEAM";
     // patch note: INFORMATION
     {
-        auto quest = mod.quest("ru_RU").open();
+        auto quest = mod.quest("ru_RU");
         // patch note: add name for SINIGR armor, it was unnamed before (lz)
-        quest("INFORMATION", "EQP_ZERO_ARMOR_S_SIN", "NAME") = u8"Îñîáàÿ íóëü-áðîíÿ";
+        quest["INFORMATION"]["EQP_ZERO_ARMOR_S_SIN"]["NAME"] = (const char *)u8"Îñîáàÿ íóëü-áðîíÿ";
     }
     {
-        auto quest = mod.quest("en_US").open();
+        auto quest = mod.quest("en_US");
-        quest("INFORMATION", "EQP_ZERO_ARMOR_S_SIN", "NAME") = u8"Special zero armor";
+        quest["INFORMATION"]["EQP_ZERO_ARMOR_S_SIN"]["NAME"] = (const char *)u8"Special zero armor";
     }
     // more known langs: cs_CZ, de_DE, et_EE, fr_FR
     // you can find vanilla dbs here (not sure if it is 1.00 or 1.03, probably 1.00):
@@ -209,10 +211,10 @@ int main(int argc, char *argv[]) {
     // patch note dev: enabled developer mode (free camera - F3 key, time shift - N key) (lz, Solant)
     mod.enable_free_camera();
     // patch note dev: make initial reactor (EQP_GLUON_REACTOR_S1) and drive (EQP_ION_DRIVE_S1) more powerful
-    db(u8"Îáîðóäîâàíèå", "EQP_GLUON_REACTOR_S1", "VALUE1") = 9'000'000.f;
+    db[u8"Îáîðóäîâàíèå"]["EQP_GLUON_REACTOR_S1"]["VALUE1"] = 9'000'000.f;
-    db(u8"Îáîðóäîâàíèå", "EQP_ION_DRIVE_S1", "VALUE1") = 4158000.f;
+    db[u8"Îáîðóäîâàíèå"]["EQP_ION_DRIVE_S1"]["VALUE1"] = 4158000.f;
     // patch note dev: make EQP_VACUUM_DRIVE_S4 more powerful
-    db(u8"Îáîðóäîâàíèå", "EQP_VACUUM_DRIVE_S4", "VALUE1") = 4158000.f;
+    db[u8"Îáîðóäîâàíèå"]["EQP_VACUUM_DRIVE_S4"]["VALUE1"] = 4158000.f;
     // patch note dev: start money, rating, glider and sector access
     mod.replace("Script/bin/B_L1_BASE1.scr", "_ADDBALANCE(300)", R"(
     _ADDBALANCE(300 )
@@ -264,7 +266,7 @@ int main(int argc, char *argv[]) {
     // patch note: lz
     // patch note:
     // patch note: Have fun!
-    db.~files();
+    db.write();
     mod.apply();
 
     // patch note:

src/aim1_mod_maker/aim1_mod_maker.h

@@ -87,11 +87,11 @@ struct mod_maker {
     std::string name;
     std::string version;
     path game_dir;
+    path aim2_game_dir;
     std::set<path> files_to_pak;
     std::set<path> files_to_distribute;
     std::set<path> code_files_to_distribute;
     std::source_location loc;
-    int db_codepage = 1251;
 
     mod_maker(std::source_location loc = std::source_location::current()) : loc{loc} {
         init(fs::current_path());
@@ -316,14 +316,37 @@ struct mod_maker {
         files_to_pak.insert(fn);
     }
 
-    db2 db() {
+    auto db() {
-        return open_db("db");
+        return open_db("db", 1251); // always 1251 probably
     }
-    db2 quest(const std::string &language = {}) {
+    auto quest(const std::string &language = {}) {
+        // TODO: check if it's possible to use utf8/16 in aim game
+        // set codepages here until we fix or implement unicode
+        int db_codepage = 1251;
+        if (language == "fr_fr") {
+            // change cp. Also for other langs
+        }
         if (language.empty()) {
-            return open_db("quest");
+            return open_db("quest", db_codepage);
         } else {
-            return open_db("quest_" + language);
+            return open_db("quest_" + language, db_codepage);
+        }
+    }
+
+    void setup_aim2_path() {
+        try {
+            aim2_game_dir = read_file(game_dir / "aim2_path.txt");
+            if (!fs::exists(aim2_game_dir)) {
+                throw std::runtime_error{"aim2 dir does not exist"};
+            }
+            if (!fs::is_directory(aim2_game_dir)) {
+                throw std::runtime_error{"aim2 path is not a directory"};
+            }
+        } catch (std::exception &e) {
+            throw std::runtime_error{std::format(
+                "Can't read aim2_path.\n"
+                "Create aim2_path.txt near your aim.exe and write down aim2 path there.\n"
+                "Error: {}", e.what())};
         }
     }
 
@@ -335,7 +358,7 @@ private:
         }
         return backup;
     }
-    auto open_db(auto &&name) {
+    auto open_db(auto &&name, int db_codepage) {
         auto d = db2{get_data_dir() / name, db_codepage};
         auto files = d.open().get_files();
         for (auto &&f : files) {
@@ -345,7 +368,7 @@ private:
             }
             files_to_distribute.insert(f);
         }
-        return d;
+        return d.open().to_map();
     }
     path get_hash_fn(path fn, const byte_array &data) const {
         return get_mod_dir() / std::format("{:0X}.hash", get_insert_hash(fn, data));