Add skill unit db.

6 files changed, 215 insertions, 0 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4a34b1c90..bc5b60a3a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -696,6 +696,8 @@ SET(SRCS
     resources/db/palettedb.h
     resources/db/petdb.cpp
     resources/db/petdb.h
+    resources/db/skillunitdb.cpp
+    resources/db/skillunitdb.h
     resources/resource.cpp
     resources/resource.h
     resources/resourcemanager.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f9670331..dcf9009d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1100,6 +1100,8 @@ manaplus_SOURCES += main.cpp \
 	      resources/db/palettedb.h \
 	      resources/db/petdb.cpp \
 	      resources/db/petdb.h \
+	      resources/db/skillunitdb.cpp \
+	      resources/db/skillunitdb.h \
 	      resources/db/sounddb.cpp \
 	      resources/db/sounddb.h \
 	      resources/db/weaponsdb.cpp \
diff --git a/src/client.cpp b/src/client.cpp
index 82099adc4..f26ea5fd9 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -116,6 +116,7 @@
 #include "resources/db/npcdialogdb.h"
 #include "resources/db/palettedb.h"
 #include "resources/db/petdb.h"
+#include "resources/db/skillunitdb.h"
 #include "resources/db/weaponsdb.h"
 
 #include "utils/cpu.h"
@@ -564,6 +565,7 @@ void Client::gameClear()
     HomunculusDB::unload();
     MonsterDB::unload();
     NPCDB::unload();
+    SkillUnitDb::unload();
     NpcDialogDB::unload();
     AvatarDB::unload();
     BadgesDB::unload();
@@ -1256,6 +1258,7 @@ int Client::gameExec()
                     BadgesDB::load();
                     WeaponsDB::load();
                     NPCDB::load();
+                    SkillUnitDb::load();
                     NpcDialogDB::load();
                     PETDB::load();
                     HorseDB::load();
diff --git a/src/defaults.cpp b/src/defaults.cpp
index a53f708b8..91a092dbe 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -588,6 +588,9 @@ DefaultsData* getPathsDefaults()
     AddDEF("homunculusesFile", "homunculuses.xml");
     AddDEF("homunculusesPatchFile", "homunculuses_patch.xml");
     AddDEF("homunculusesPatchDir", "homunculuses.d");
+    AddDEF("skillUnitsFile", "skillunits.xml");
+    AddDEF("skillUnitsPatchFile", "skillunits_patch.xml");
+    AddDEF("skillUnitsPatchDir", "skillunits.d");
     AddDEF("mapsRemapFile", "maps/remap.xml");
     AddDEF("mapsRemapPatchFile", "maps/remap_patch.xml");
     AddDEF("mapsRemapPatchDir", "maps/remap.d");
diff --git a/src/resources/db/skillunitdb.cpp b/src/resources/db/skillunitdb.cpp
new file mode 100644
index 000000000..c2131eca4
--- /dev/null
+++ b/src/resources/db/skillunitdb.cpp
@@ -0,0 +1,160 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/db/skillunitdb.h"
+
+#include "configuration.h"
+#include "logger.h"
+
+#include "resources/beingcommon.h"
+#include "resources/beinginfo.h"
+#include "resources/spritereference.h"
+
+#include "utils/gettext.h"
+#include "utils/dtor.h"
+
+#include "debug.h"
+
+namespace
+{
+    BeingInfos mSkillUnitInfos;
+    bool mLoaded = false;
+}
+
+void SkillUnitDb::load()
+{
+    if (mLoaded)
+        unload();
+
+    logger->log1("Initializing skill unit database...");
+    loadXmlFile(paths.getStringValue("skillUnitsFile"));
+    loadXmlFile(paths.getStringValue("skillUnitsPatchFile"));
+    loadXmlDir("skillUnitsPatchDir", loadXmlFile);
+    mLoaded = true;
+}
+
+void SkillUnitDb::loadXmlFile(const std::string &fileName)
+{
+    XML::Document doc(fileName, UseResman_true, SkipError_false);
+    const XmlNodePtrConst rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlNameEqual(rootNode, "skillunits"))
+    {
+        logger->log("SkillUnitDb: Error while loading %s!",
+            fileName.c_str());
+        return;
+    }
+
+    // iterate <skillunit>s
+    for_each_xml_child_node(skillUnitNode, rootNode)
+    {
+        if (xmlNameEqual(skillUnitNode, "include"))
+        {
+            const std::string name = XML::getProperty(skillUnitNode, "name", "");
+            if (!name.empty())
+                loadXmlFile(name);
+            continue;
+        }
+        else if (!xmlNameEqual(skillUnitNode, "skillunit"))
+        {
+            continue;
+        }
+
+        const BeingTypeId id = fromInt(XML::getProperty(
+            skillUnitNode, "id", -1), BeingTypeId);
+        if (id == BeingTypeId_negOne)
+        {
+            logger->log("SkillUnitDb: skill unit with missing ID in %s!",
+                paths.getStringValue("skillUnitsFile").c_str());
+            continue;
+        }
+
+        BeingInfo *currentInfo = nullptr;
+        if (mSkillUnitInfos.find(id) != mSkillUnitInfos.end())
+            currentInfo = mSkillUnitInfos[id];
+        if (!currentInfo)
+            currentInfo = new BeingInfo;
+
+        currentInfo->setName(XML::langProperty(skillUnitNode,
+            // TRANSLATORS: unknown info name
+            "name", _("skill")));
+
+        currentInfo->setTargetSelection(XML::getBoolProperty(skillUnitNode,
+            "targetSelection", false));
+
+        BeingCommon::readBasicAttributes(currentInfo, skillUnitNode, "talk");
+
+        currentInfo->setDeadSortOffsetY(XML::getProperty(skillUnitNode,
+            "deadSortOffsetY", 31));
+
+        SpriteDisplay display;
+        for_each_xml_child_node(spriteNode, skillUnitNode)
+        {
+            if (!spriteNode->xmlChildrenNode)
+                continue;
+
+            if (xmlNameEqual(spriteNode, "sprite"))
+            {
+                SpriteReference *const currentSprite = new SpriteReference;
+                currentSprite->sprite = reinterpret_cast<const char*>(
+                    spriteNode->xmlChildrenNode->content);
+                currentSprite->variant =
+                    XML::getProperty(spriteNode, "variant", 0);
+                display.sprites.push_back(currentSprite);
+            }
+            else if (xmlNameEqual(spriteNode, "particlefx"))
+            {
+                std::string particlefx = reinterpret_cast<const char*>(
+                    spriteNode->xmlChildrenNode->content);
+                display.particles.push_back(particlefx);
+            }
+        }
+
+        currentInfo->setDisplay(display);
+
+        mSkillUnitInfos[id] = currentInfo;
+    }
+}
+
+void SkillUnitDb::unload()
+{
+    delete_all(mSkillUnitInfos);
+    mSkillUnitInfos.clear();
+
+    mLoaded = false;
+}
+
+BeingInfo *SkillUnitDb::get(const BeingTypeId id)
+{
+    const BeingInfoIterator i = mSkillUnitInfos.find(id);
+
+    if (i == mSkillUnitInfos.end())
+    {
+        logger->log("SkillUnitDb: Warning, unknown skill unit id %d requested",
+            toInt(id, int));
+        return BeingInfo::unknown;
+    }
+    else
+    {
+        return i->second;
+    }
+}
diff --git a/src/resources/db/skillunitdb.h b/src/resources/db/skillunitdb.h
new file mode 100644
index 000000000..8c6ce61c2
--- /dev/null
+++ b/src/resources/db/skillunitdb.h
@@ -0,0 +1,45 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_DB_SKILLUNITDB_H
+#define RESOURCES_DB_SKILLUNITDB_H
+
+#include "enums/simpletypes/beingtypeid.h"
+
+#include <string>
+
+#include "localconsts.h"
+
+class BeingInfo;
+
+namespace SkillUnitDb
+{
+    void load();
+
+    void loadXmlFile(const std::string &fileName);
+
+    void unload();
+
+    BeingInfo *get(const BeingTypeId id) A_WARN_UNUSED;
+}  // namespace SkillUnitDb
+
+#endif  // RESOURCES_DB_SKILLUNITDB_H