From 114f99ddbf0b0e6fb99c116e0622ab9da7dbd47d Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 24 Mar 2013 15:10:03 +0100
Subject: [PATCH] add skill records when creating a new base file

---
 apps/opencs/model/doc/document.cpp | 10 ++++++++++
 apps/opencs/model/world/data.cpp   | 10 ++++++++++
 apps/opencs/model/world/data.hpp   |  4 ++++
 components/esm/loadskil.cpp        | 32 ++++++++++++++++++------------
 components/esm/loadskil.hpp        |  2 ++
 5 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 47cf1f6642..deafe8eb84 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -198,6 +198,16 @@ void CSMDoc::Document::createBase()
     }
 
     /// \todo add GMSTs
+
+    for (int i=0; i<27; ++i)
+    {
+        ESM::Skill record;
+        record.mIndex = i;
+        record.mId = ESM::Skill::getIndexToId (record.mIndex);
+        record.blank();
+
+        getData().getSkills().add (record);
+    }
 }
 
 CSMDoc::Document::Document (const std::vector<boost::filesystem::path>& files, bool new_)
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 1b65fecc03..bc78cb46be 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -74,6 +74,16 @@ CSMWorld::IdCollection<ESM::GameSetting>& CSMWorld::Data::getGmsts()
     return mGmsts;
 }
 
+const CSMWorld::IdCollection<ESM::Skill>& CSMWorld::Data::getSkills() const
+{
+    return mSkills;
+}
+
+CSMWorld::IdCollection<ESM::Skill>& CSMWorld::Data::getSkills()
+{
+    return mSkills;
+}
+
 QAbstractItemModel *CSMWorld::Data::getTableModel (const UniversalId& id)
 {
     std::map<UniversalId::Type, QAbstractItemModel *>::iterator iter = mModelIndex.find (id.getType());
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index dc9aee0618..ac953dbece 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -46,6 +46,10 @@ namespace CSMWorld
 
             IdCollection<ESM::GameSetting>& getGmsts();
 
+            const IdCollection<ESM::Skill>& getSkills() const;
+
+            IdCollection<ESM::Skill>& getSkills();
+
             QAbstractItemModel *getTableModel (const UniversalId& id);
             ///< If no table model is available for \a id, an exception is thrown.
             ///
diff --git a/components/esm/loadskil.cpp b/components/esm/loadskil.cpp
index ac9fc27897..b9d588eef4 100644
--- a/components/esm/loadskil.cpp
+++ b/components/esm/loadskil.cpp
@@ -103,19 +103,7 @@ void Skill::load(ESMReader &esm)
 
     // create an ID from the index and the name (only used in the editor and likely to change in the
     // future)
-    std::ostringstream stream;
-
-    stream << "#";
-
-    if (mIndex<10)
-        stream << "0";
-
-    stream << mIndex;
-
-    if (mIndex>=0 && mIndex<Length)
-        stream << sSkillNameIds[mIndex].substr (6);
-
-    mId = stream.str();
+    mId = getIndexToId (mIndex);
 }
 void Skill::save(ESMWriter &esm)
 {
@@ -129,5 +117,23 @@ void Skill::save(ESMWriter &esm)
         mData.mAttribute = 0;
         mData.mSpecialization = 0;
         mData.mUseValue[0] = mData.mUseValue[1] = mData.mUseValue[2] = mData.mUseValue[3] = 1.0;
+        mDescription.clear();
+    }
+
+    std::string Skill::getIndexToId (int index)
+    {
+        std::ostringstream stream;
+
+        stream << "#";
+
+        if (index<10)
+            stream << "0";
+
+        stream << index;
+
+        if (index>=0 && index<Length)
+            stream << sSkillNameIds[index].substr (6);
+
+        return stream.str();
     }
 }
diff --git a/components/esm/loadskil.hpp b/components/esm/loadskil.hpp
index 905198cd91..83a4d8bfd9 100644
--- a/components/esm/loadskil.hpp
+++ b/components/esm/loadskil.hpp
@@ -78,6 +78,8 @@ struct Skill
 
     void blank();
      ///< Set record to default state (does not touch the ID/index).
+
+    static std::string getIndexToId (int index);
 };
 }
 #endif