From 7c3bb6124a782e933c1f04de1e295df18f32bea8 Mon Sep 17 00:00:00 2001 From: Atemo Date: Mon, 29 Aug 2022 16:28:54 +0200 Subject: [PATCH] Added missing increase of the versioning (#7220) Follow up https://github.com/rathena/rathena/commit/17751aa4d71d85a35a498e4c1677b9ee9d26331a --- db/import-tmpl/item_db.yml | 2 +- db/item_db.yml | 2 +- db/pre-re/item_db.yml | 2 +- db/pre-re/item_db_equip.yml | 2 +- db/pre-re/item_db_etc.yml | 2 +- db/pre-re/item_db_usable.yml | 2 +- db/re/item_db.yml | 2 +- db/re/item_db_equip.yml | 2 +- db/re/item_db_etc.yml | 2 +- db/re/item_db_usable.yml | 2 +- src/map/itemdb.hpp | 2 +- src/tool/csv2yaml.cpp | 4 ++-- src/tool/yamlupgrade.cpp | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/db/import-tmpl/item_db.yml b/db/import-tmpl/item_db.yml index 56af674622..116be0e342 100644 --- a/db/import-tmpl/item_db.yml +++ b/db/import-tmpl/item_db.yml @@ -86,7 +86,7 @@ Header: Type: ITEM_DB - Version: 2 + Version: 3 #Body: # THQ Quest Items diff --git a/db/item_db.yml b/db/item_db.yml index d1fd5b5e88..4b326a4a7c 100644 --- a/db/item_db.yml +++ b/db/item_db.yml @@ -86,7 +86,7 @@ Header: Type: ITEM_DB - Version: 2 + Version: 3 Footer: Imports: diff --git a/db/pre-re/item_db.yml b/db/pre-re/item_db.yml index a75f06fec4..d927fba0c0 100644 --- a/db/pre-re/item_db.yml +++ b/db/pre-re/item_db.yml @@ -86,7 +86,7 @@ Header: Type: ITEM_DB - Version: 2 + Version: 3 Footer: Imports: diff --git a/db/pre-re/item_db_equip.yml b/db/pre-re/item_db_equip.yml index ebfae31683..81b1d37bcb 100644 --- a/db/pre-re/item_db_equip.yml +++ b/db/pre-re/item_db_equip.yml @@ -86,7 +86,7 @@ Header: Type: ITEM_DB - Version: 2 + Version: 3 Body: - Id: 1101 diff --git a/db/pre-re/item_db_etc.yml b/db/pre-re/item_db_etc.yml index 02785388f1..5b16e88237 100644 --- a/db/pre-re/item_db_etc.yml +++ b/db/pre-re/item_db_etc.yml @@ -86,7 +86,7 @@ Header: Type: ITEM_DB - Version: 2 + Version: 3 Body: - Id: 670 diff --git a/db/pre-re/item_db_usable.yml b/db/pre-re/item_db_usable.yml index a0dac1bc7c..2be5e684eb 100644 --- a/db/pre-re/item_db_usable.yml +++ b/db/pre-re/item_db_usable.yml @@ -86,7 +86,7 @@ Header: Type: ITEM_DB - Version: 2 + Version: 3 Body: - Id: 501 diff --git a/db/re/item_db.yml b/db/re/item_db.yml index e89134bde3..82c94786f3 100644 --- a/db/re/item_db.yml +++ b/db/re/item_db.yml @@ -86,7 +86,7 @@ Header: Type: ITEM_DB - Version: 2 + Version: 3 Footer: Imports: diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index 98fdc08373..a4ba7fe260 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -86,7 +86,7 @@ Header: Type: ITEM_DB - Version: 2 + Version: 3 Body: - Id: 1101 diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml index 481ecc03eb..90ac97fb64 100644 --- a/db/re/item_db_etc.yml +++ b/db/re/item_db_etc.yml @@ -86,7 +86,7 @@ Header: Type: ITEM_DB - Version: 2 + Version: 3 Body: - Id: 670 diff --git a/db/re/item_db_usable.yml b/db/re/item_db_usable.yml index 89e5a4728e..77c60628a3 100644 --- a/db/re/item_db_usable.yml +++ b/db/re/item_db_usable.yml @@ -86,7 +86,7 @@ Header: Type: ITEM_DB - Version: 2 + Version: 3 Body: - Id: 500 diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index cf782e60fe..8bdea32eff 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -1294,7 +1294,7 @@ private: e_sex defaultGender( const ryml::NodeRef& node, std::shared_ptr id ); public: - ItemDatabase() : TypesafeCachedYamlDatabase("ITEM_DB", 2, 1) { + ItemDatabase() : TypesafeCachedYamlDatabase("ITEM_DB", 3, 1) { } diff --git a/src/tool/csv2yaml.cpp b/src/tool/csv2yaml.cpp index 35b13158bd..b823c5469a 100644 --- a/src/tool/csv2yaml.cpp +++ b/src/tool/csv2yaml.cpp @@ -301,14 +301,14 @@ int do_init( int argc, char** argv ){ } item_txt_data(path_db_mode, path_db); - if (!process("ITEM_DB", 2, { path_db_mode }, "item_db", [](const std::string& path, const std::string& name_ext) -> bool { + if (!process("ITEM_DB", 3, { path_db_mode }, "item_db", [](const std::string& path, const std::string& name_ext) -> bool { return itemdb_read_db((path + name_ext).c_str()); })) { return 0; } item_txt_data(path_db_import, path_db_import); - if (!process("ITEM_DB", 2, { path_db_import }, "item_db", [](const std::string& path, const std::string& name_ext) -> bool { + if (!process("ITEM_DB", 3, { path_db_import }, "item_db", [](const std::string& path, const std::string& name_ext) -> bool { return itemdb_read_db((path + name_ext).c_str()); })) { return 0; diff --git a/src/tool/yamlupgrade.cpp b/src/tool/yamlupgrade.cpp index 76a71ddf7b..536a221e18 100644 --- a/src/tool/yamlupgrade.cpp +++ b/src/tool/yamlupgrade.cpp @@ -110,7 +110,7 @@ int do_init(int argc, char** argv) { return 0; } - if (!process("ITEM_DB", 2, root_paths, "item_db", [](const std::string& path, const std::string& name_ext, uint32 source_version) -> bool { + if (!process("ITEM_DB", 3, root_paths, "item_db", [](const std::string& path, const std::string& name_ext, uint32 source_version) -> bool { return upgrade_item_db(path + name_ext, source_version); })) { return 0;