From 09f11fbff224b0c5c364629d56bd2929d0956875 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 24 Jan 2015 00:18:17 +0100
Subject: [PATCH] ESSImport: convert selected spell / selected enchant item

---
 apps/essimporter/converter.hpp  | 21 +++++++++++++++++++++
 apps/essimporter/importacdt.cpp | 11 +++++------
 apps/essimporter/importacdt.hpp |  3 +++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 7565b78d4..6f85b01cf 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -226,7 +226,28 @@ public:
 
         ESM::NpcStats& npcStats = mContext->mPlayer.mObject.mNpcStats;
         convertNpcData(refr.mActorData, npcStats);
+
+        mSelectedSpell = refr.mActorData.mSelectedSpell;
+        if (!refr.mActorData.mSelectedEnchantItem.empty())
+        {
+            ESM::InventoryState& invState = mContext->mPlayer.mObject.mInventory;
+
+            for (unsigned int i=0; i<invState.mItems.size(); ++i)
+            {
+                // FIXME: in case of conflict (multiple items with this refID) use the already equipped one?
+                if (Misc::StringUtils::ciEqual(invState.mItems[i].mRef.mRefID, refr.mActorData.mSelectedEnchantItem))
+                    invState.mSelectedEnchantItem = i;
+            }
+        }
     }
+    virtual void write(ESM::ESMWriter& esm)
+    {
+        esm.startRecord(ESM::REC_ASPL);
+        esm.writeHNString("ID__", mSelectedSpell);
+        esm.endRecord(ESM::REC_ASPL);
+    }
+private:
+    std::string mSelectedSpell;
 };
 
 class ConvertPCDT : public Converter
diff --git a/apps/essimporter/importacdt.cpp b/apps/essimporter/importacdt.cpp
index 00bd4ad80..136183668 100644
--- a/apps/essimporter/importacdt.cpp
+++ b/apps/essimporter/importacdt.cpp
@@ -62,17 +62,16 @@ namespace ESSImport
 
         // unsure at which point between LSTN and CHRD
         if (esm.isNextSub("APUD"))
-            esm.skipHSub(); // 40 bytes, starts with string "ancestor guardian"...
+            esm.skipHSub(); // 40 bytes, starts with string "ancestor guardian". maybe spellcasting in progress?
 
         if (esm.isNextSub("WNAM"))
         {
-            esm.skipHSub(); // seen values: "ancestor guardian", "bound dagger_en". Summoned creature / bound weapons?
+            std::string id = esm.getHString();
 
             if (esm.isNextSub("XNAM"))
-            {
-                // "demon tanto", probably the ID of spell/item that created the bound weapon/crature?
-                esm.skipHSub();
-            }
+                mSelectedEnchantItem = esm.getHString();
+            else
+                mSelectedSpell = id;
 
             if (esm.isNextSub("YNAM"))
                 esm.skipHSub(); // 4 byte, 0
diff --git a/apps/essimporter/importacdt.hpp b/apps/essimporter/importacdt.hpp
index 3e3003f58..4eb5edb73 100644
--- a/apps/essimporter/importacdt.hpp
+++ b/apps/essimporter/importacdt.hpp
@@ -52,6 +52,9 @@ namespace ESSImport
         // to change them ingame
         int mCombatStats[3][2];
 
+        std::string mSelectedSpell;
+        std::string mSelectedEnchantItem;
+
         SCRI mSCRI;
 
         void load(ESM::ESMReader& esm);