From 62fa051ace7097e78134d46505070a70c08e128f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 20 Apr 2017 22:00:49 +0300 Subject: Add item option db. For now unused. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/client.cpp | 3 + src/defaults.cpp | 3 + src/resources/db/itemoptiondb.cpp | 143 ++++++++++++++++++++++++++++++++++++++ src/resources/db/itemoptiondb.h | 46 ++++++++++++ 6 files changed, 199 insertions(+) create mode 100644 src/resources/db/itemoptiondb.cpp create mode 100644 src/resources/db/itemoptiondb.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 06f05130d..5e2d15a3f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -684,6 +684,8 @@ SET(SRCS resources/basicstat.h resources/db/itemfielddb.cpp resources/db/itemfielddb.h + resources/db/itemoptiondb.cpp + resources/db/itemoptiondb.h resources/db/languagedb.cpp resources/db/languagedb.h resources/iteminfo.h diff --git a/src/Makefile.am b/src/Makefile.am index 012926866..404c10e58 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1356,6 +1356,8 @@ SRC = ${BASE_SRC} \ resources/basicstat.h \ resources/db/itemfielddb.cpp \ resources/db/itemfielddb.h \ + resources/db/itemoptiondb.cpp \ + resources/db/itemoptiondb.h \ resources/db/languagedb.cpp \ resources/db/languagedb.h \ resources/db/mapdb.cpp \ diff --git a/src/client.cpp b/src/client.cpp index 2868b675d..72aac6391 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -115,6 +115,7 @@ #include "resources/db/horsedb.h" #include "resources/db/itemdb.h" #include "resources/db/itemfielddb.h" +#include "resources/db/itemoptiondb.h" #include "resources/db/languagedb.h" #include "resources/db/sounddb.h" #include "resources/db/mapdb.h" @@ -638,6 +639,7 @@ void Client::gameClear() TextDb::unload(); EmoteDB::unload(); ItemDB::unload(); + ItemOptionDb::unload(); ItemFieldDb::unload(); const ServerTypeT type = Net::getNetworkType(); if (type == ServerType::EATHENA || @@ -1370,6 +1372,7 @@ int Client::gameExec() TextDb::load(); MapDB::load(); ItemFieldDb::load(); + ItemOptionDb::load(); ItemDB::load(); Being::load(); const ServerTypeT type = Net::getNetworkType(); diff --git a/src/defaults.cpp b/src/defaults.cpp index 96674599f..cf4687973 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -595,6 +595,9 @@ DefaultsData* getPathsDefaults() AddDEF("itemFieldsFile", "itemfields.xml"); AddDEF("itemFieldsPatchFile", "itemfields_patch.xml"); AddDEF("itemFieldsPatchDir", "itemfields.d"); + AddDEF("itemOptionsFile", "itemoptions.xml"); + AddDEF("itemOptionsPatchFile", "itemoptions_patch.xml"); + AddDEF("itemOptionsPatchDir", "itemoptions.d"); AddDEF("avatarsFile", "avatars.xml"); AddDEF("avatarsPatchFile", "avatars_patch.xml"); AddDEF("avatarsPatchDir", "avatars.d"); diff --git a/src/resources/db/itemoptiondb.cpp b/src/resources/db/itemoptiondb.cpp new file mode 100644 index 000000000..becdf7406 --- /dev/null +++ b/src/resources/db/itemoptiondb.cpp @@ -0,0 +1,143 @@ +/* + * The ManaPlus Client + * Copyright (C) 2016-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "resources/db/itemoptiondb.h" + +#include "configuration.h" + +#include "utils/checkutils.h" +#include "utils/dtor.h" + +#include "resources/beingcommon.h" + +#include "resources/db/itemfielddb.h" + +#include "resources/item/itemfieldtype.h" + +#include "debug.h" + +namespace +{ + ItemOptionDb::OptionInfos mOptions; + bool mLoaded = false; +} // namespace + +void ItemOptionDb::load() +{ + if (mLoaded) + unload(); + + loadXmlFile(paths.getStringValue("itemOptionsFile"), SkipError_false); + loadXmlFile(paths.getStringValue("itemOptionsPatchFile"), SkipError_true); + loadXmlDir("itemOptionsPatchDir", loadXmlFile); + mLoaded = true; +} + +static void addFieldByName(std::vector &options, + XmlNodeConstPtr node, + const ItemFieldDb::FieldInfos &fields, + const char *const name) +{ + std::string value = XML::getProperty(node, name, ""); + if (value.empty()) + return; + + FOR_EACH (ItemFieldDb::FieldInfos::const_iterator, it, fields) + { + const std::string fieldName = (*it).first; + if (fieldName == value) + { + options.push_back((*it).second); + return; + } + } +} + +static void readOptionFields(std::vector &options, + XmlNodeConstPtr node, + const ItemFieldDb::FieldInfos &fields) +{ + addFieldByName(options, node, fields, "field"); + for (int f = 0; f < 15; f ++) + { + const std::string field = strprintf("field%d", f); + addFieldByName(options, node, fields, field.c_str()); + } +} + +void ItemOptionDb::loadXmlFile(const std::string &fileName, + const SkipError skipError) +{ + XML::Document doc(fileName, + UseVirtFs_true, + skipError); + XmlNodeConstPtrConst rootNode = doc.rootNode(); + + if (!rootNode || !xmlNameEqual(rootNode, "itemoptions")) + { + if (skipError == SkipError_true) + { + logger->log("ItemFieldDb: Error while loading %s!", + fileName.c_str()); + } + else + { + reportAlways("ItemFieldDb: Error while loading %s!", + fileName.c_str()); + } + return; + } + + const ItemFieldDb::FieldInfos &requiredFields = + ItemFieldDb::getRequiredFields(); + const ItemFieldDb::FieldInfos &addFields = + ItemFieldDb::getAddFields(); + + for_each_xml_child_node(node, rootNode) + { + if (xmlNameEqual(node, "include")) + { + const std::string name = XML::getProperty(node, "name", ""); + if (!name.empty()) + loadXmlFile(name, skipError); + continue; + } + if (xmlNameEqual(node, "option")) + { + const int id = XML::getProperty(node, + "id", + 0); + if (id <= 0) + { + reportAlways("Empty id field in ItemOptionDb"); + continue; + } + std::vector &options = mOptions[id]; + readOptionFields(options, node, requiredFields); + readOptionFields(options, node, addFields); + } + } +} + +void ItemOptionDb::unload() +{ + mOptions.clear(); + mLoaded = false; +} diff --git a/src/resources/db/itemoptiondb.h b/src/resources/db/itemoptiondb.h new file mode 100644 index 000000000..6c7fb898f --- /dev/null +++ b/src/resources/db/itemoptiondb.h @@ -0,0 +1,46 @@ +/* + * The ManaPlus Client + * Copyright (C) 2016-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef RESOURCES_DB_ITEMOPTIONDB_H +#define RESOURCES_DB_ITEMOPTIONDB_H + +#include "enums/simpletypes/skiperror.h" + +#include +#include +#include + +#include "localconsts.h" + +struct ItemFieldType; + +namespace ItemOptionDb +{ + void load(); + + void unload(); + + void loadXmlFile(const std::string &fileName, + const SkipError skipError); + + typedef std::map > OptionInfos; +} // namespace ItemOptionDb + +#endif // RESOURCES_DB_ITEMOPTIONDB_H -- cgit v1.2.3-60-g2f50