Merge remote-tracking branch 'cfcohen/master'

apps/esmtool/esmtool.cpp

@@ -13,7 +13,7 @@
 
 #include "record.hpp"
 
-#define ESMTOOL_VERSION 1.1
+#define ESMTOOL_VERSION 1.2
 
 // Create a local alias for brevity
 namespace bpo = boost::program_options;
@@ -58,6 +58,8 @@ struct Arguments
     std::string filename;
     std::string outname;
 
+    std::vector<std::string> types;
+  
     ESMData data;
     ESM::ESMReader reader;
     ESM::ESMWriter writer;
@@ -70,7 +72,12 @@ bool parseOptions (int argc, char** argv, Arguments &info)
     desc.add_options()
         ("help,h", "print help message.")
         ("version,v", "print version information and quit.")
-        ("raw,r", "Show an unformattet list of all records and subrecords.")
+        ("raw,r", "Show an unformatted list of all records and subrecords.")
+        // The intention is that this option would interact better
+        // with other modes including clone, dump, and raw. 
+        ("type,t", bpo::value< std::vector<std::string> >(),
+         "Show only records of this type (four character record code).  May "
+         "be specified multiple times.  Only affects dump mode.")
         ("quiet,q", "Supress all record information. Useful for speed tests.")
         ("loadcells,C", "Browse through contents of all cells.")
 
@@ -122,6 +129,9 @@ bool parseOptions (int argc, char** argv, Arguments &info)
         return false;
     }
 
+    if (variables.count("type") > 0)
+      info.types = variables["type"].as< std::vector<std::string> >();
+
     info.mode = variables["mode"].as<std::string>();
     if (!(info.mode == "dump" || info.mode == "clone" || info.mode == "comp"))
     {
@@ -306,14 +316,23 @@ int load(Arguments& info)
             uint32_t flags;
             esm.getRecHeader(flags);
 
+            // Is the user interested in this record type?
+            bool interested = true;
+            if (info.types.size() > 0)
+            {
+                std::vector<std::string>::iterator match;
+                match = std::find(info.types.begin(), info.types.end(), 
+                                  n.toString());
+                if (match == info.types.end()) interested = false;
+            }
+
             std::string id = esm.getHNOString("NAME");
 
-            if(!quiet)
+            if(!quiet && interested)
                 std::cout << "\nRecord: " << n.toString()
                      << " '" << id << "'\n";
 
-            EsmTool::RecordBase *record =
+            EsmTool::RecordBase *record = EsmTool::RecordBase::create(n);
-                EsmTool::RecordBase::create(n.val);
 
             if (record == 0) {
                 if (std::find(skipped.begin(), skipped.end(), n.val) == skipped.end())
@@ -326,18 +345,16 @@ int load(Arguments& info)
                 if (quiet) break;
                 std::cout << "  Skipping\n";
             } else {
-                if (record->getType() == ESM::REC_GMST) {
+                if (record->getType().val == ESM::REC_GMST) {
                     // preset id for GameSetting record
                     record->cast<ESM::GameSetting>()->get().mId = id;
                 }
                 record->setId(id);
                 record->setFlags((int) flags);
                 record->load(esm);
-                if (!quiet) {
+                if (!quiet && interested) record->print();
-                    record->print();
-                }
 
-                if (record->getType() == ESM::REC_CELL && loadCells) {
+                if (record->getType().val == ESM::REC_CELL && loadCells) {
                     loadCell(record->cast<ESM::Cell>()->get(), esm, info);
                 }
 
@@ -434,7 +451,7 @@ int clone(Arguments& info)
     {
         EsmTool::RecordBase *record = *it;
         
-        name.val = record->getType();
+        name.val = record->getType().val;
 
         esm.startRecord(name.toString(), record->getFlags());
 

apps/esmtool/record.cpp

@@ -1,15 +1,85 @@
 #include "record.hpp"
 
 #include <iostream>
+#include <boost/format.hpp>
+
+void printAIPackage(ESM::AIPackage p)
+{
+  if (p.mType == ESM::AI_Wander)
+  {
+      std::cout << "  AIType Wander:" << std::endl;
+      std::cout << "    Distance: " << p.mWander.mDistance << std::endl;
+      std::cout << "    Duration: " << p.mWander.mDuration << std::endl;
+      std::cout << "    Time of Day: " << (int)p.mWander.mTimeOfDay << std::endl;
+      if (p.mWander.mUnk != 1)
+          std::cout <<  "    Unknown: " << (int)p.mWander.mUnk << std::endl;
+
+      std::cout << "    Idle: ";
+      for (int i = 0; i != 8; i++)
+          std::cout << (int)p.mWander.mIdle[i] << " ";
+      std::cout << std::endl;
+  }
+  else if (p.mType == ESM::AI_Travel)
+  {
+      std::cout << "  AIType Travel:" << std::endl;
+      std::cout << "    Travel Coordinates: (" << p.mTravel.mX << ","
+           << p.mTravel.mY << "," << p.mTravel.mZ << ")" << std::endl;
+      std::cout << "    Travel Unknown: " << (int)p.mTravel.mUnk << std::endl;
+  }
+  else if (p.mType == ESM::AI_Follow || p.mType == ESM::AI_Escort)
+  {
+      if (p.mType == ESM::AI_Follow) std::cout << "  AIType Follow:" << std::endl;
+      else std::cout << "  AIType Escort:" << std::endl;
+
+      std::cout << "    Follow Coordinates: (" << p.mTarget.mX << ","
+           << p.mTarget.mY << "," << p.mTarget.mZ << ")" << std::endl;
+      std::cout << "    Duration: " << p.mTarget.mDuration << std::endl;
+      std::cout << "    Target ID: " << p.mTarget.mId.toString() << std::endl;
+      std::cout << "    Unknown: " << (int)p.mTarget.mUnk << std::endl;
+  }
+  else if (p.mType == ESM::AI_Activate)
+  {
+      std::cout << "  AIType Activate:" << std::endl;
+      std::cout << "    Name: " << p.mActivate.mName.toString() << std::endl;
+      std::cout << "    Activate Unknown: " << (int)p.mActivate.mUnk << std::endl;
+  }
+  else {
+      std::cout << "    BadPackage: " << boost::format("0x%08x") % p.mType << std::endl;
+  }
+
+  if (p.mCellName != "")
+      std::cout << "    Cell Name: " << p.mCellName << std::endl;
+}
+
+void printEffectList(ESM::EffectList effects)
+{
+    int i = 0;
+    std::vector<ESM::ENAMstruct>::iterator eit;
+    for (eit = effects.mList.begin(); eit != effects.mList.end(); eit++)
+    {
+        std::cout << "  Effect[" << i << "]: " << eit->mEffectID << std::endl;
+        if (eit->mSkill != -1)
+            std::cout << "    Skill: " << (int)eit->mSkill << std::endl;
+        if (eit->mAttribute != -1)
+            std::cout << "    Attribute: " << (int)eit->mAttribute << std::endl; 
+        std::cout << "    Range: " << eit->mRange << std::endl;
+        // Area is always zero if range type is "Self"
+        if (eit->mRange != ESM::RT_Self)
+            std::cout << "    Area: " << eit->mArea << std::endl;
+        std::cout << "    Duration: " << eit->mDuration << std::endl;
+        std::cout << "    Magnitude: " << eit->mMagnMin << "-" << eit->mMagnMax << std::endl;
+        i++;
+    }
+}
 
 namespace EsmTool {
 
 RecordBase *
-RecordBase::create(int type)
+RecordBase::create(ESM::NAME type)
 {
     RecordBase *record = 0;
 
-    switch (type) {
+    switch (type.val) {
     case ESM::REC_ACTI:
     {
         record = new EsmTool::Record<ESM::Activator>;
@@ -233,7 +303,7 @@ template<>
 void Record<ESM::Activator>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Mesh: " << mData.mModel << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Script: " << mData.mScript << std::endl;
 }
 
@@ -241,38 +311,87 @@ template<>
 void Record<ESM::Potion>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+    std::cout << "  Value: " << mData.mData.mValue << std::endl;
+    std::cout << "  AutoCalc: " << mData.mData.mAutoCalc << std::endl;
+    printEffectList(mData.mEffects);
 }
 
 template<>
 void Record<ESM::Armor>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Mesh: " << mData.mModel << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
         std::cout << "  Script: " << mData.mScript << std::endl;
+    if (mData.mEnchant != "")
         std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
     std::cout << "  Type: " << mData.mData.mType << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+    std::cout << "  Value: " << mData.mData.mValue << std::endl;
+    std::cout << "  Health: " << mData.mData.mHealth << std::endl;
+    std::cout << "  Armor: " << mData.mData.mArmor << std::endl; 
+    std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
+    std::vector<ESM::PartReference>::iterator pit;
+    for (pit = mData.mParts.mParts.begin(); pit != mData.mParts.mParts.end(); pit++)
+    {
+        std::cout << "  Body Part: " << (int)(pit->mPart) << std::endl;
+        std::cout << "    Male Name: " << pit->mMale << std::endl;
+        if (pit->mFemale != "")
+            std::cout << "    Female Name: " << pit->mFemale << std::endl;
+    }
 }
 
 template<>
 void Record<ESM::Apparatus>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Icon: " << mData.mIcon << std::endl;
+    std::cout << "  Script: " << mData.mScript << std::endl;
+    std::cout << "  Type: " << mData.mData.mType << std::endl;
+    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+    std::cout << "  Value: " << mData.mData.mValue << std::endl;
+    std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
 }
 
 template<>
 void Record<ESM::BodyPart>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Mesh: " << mData.mModel << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Type: " << (int)mData.mData.mType << std::endl;
+    std::cout << "  Flags: " << (int)mData.mData.mFlags << std::endl;
+    std::cout << "  Part: " << (int)mData.mData.mPart << std::endl;
+    std::cout << "  Vampire: " << (int)mData.mData.mVampire << std::endl;
 }
 
 template<>
 void Record<ESM::Book>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Mesh: " << mData.mModel << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    if (mData.mEnchant != "")
+        std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
+    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+    std::cout << "  Value: " << mData.mData.mValue << std::endl;
+    std::cout << "  IsScroll: " << mData.mData.mIsScroll << std::endl;
+    std::cout << "  SkillID: " << mData.mData.mSkillID << std::endl;
+    std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
+    std::cout << "  Text: [skipped]" << std::endl;
+    // Skip until multi-line fields is controllable by a command line option.
+    // Mildly problematic because there are no parameter to print() currently.
+    // std::cout << "-------------------------------------------" << std::endl;
+    // std::cout << mData.mText << std::endl;
+    // std::cout << "-------------------------------------------" << std::endl;
 }
 
 template<>
@@ -281,13 +400,38 @@ void Record<ESM::BirthSign>::print()
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Texture: " << mData.mTexture << std::endl;
     std::cout << "  Description: " << mData.mDescription << std::endl;
+    std::vector<std::string>::iterator pit;
+    for (pit = mData.mPowers.mList.begin(); pit != mData.mPowers.mList.end(); pit++)
+        std::cout << "  Power: " << *pit << std::endl;    
 }
 
 template<>
 void Record<ESM::Cell>::print()
 {
+    // None of the cells have names...
+    if (mData.mName != "")
         std::cout << "  Name: " << mData.mName << std::endl;
+    if (mData.mRegion != "")
         std::cout << "  Region: " << mData.mRegion << std::endl;
+    std::cout << "  Flags: " << (int)mData.mData.mFlags << std::endl;
+    
+    std::cout << "  Coordinates: " << " (" << mData.getGridX() << ","
+              << mData.getGridY() << ")" << std::endl;
+    
+    if (mData.mData.mFlags & ESM::Cell::Interior && 
+        !(mData.mData.mFlags & ESM::Cell::QuasiEx)) 
+    {
+        std::cout << "  Ambient Light Color: " << mData.mAmbi.mAmbient << std::endl;
+        std::cout << "  Sunlight Color: " << mData.mAmbi.mSunlight << std::endl;
+        std::cout << "  Fog Color: " << mData.mAmbi.mFog << std::endl;
+        std::cout << "  Fog Density: " << mData.mAmbi.mFogDensity << std::endl;
+        std::cout << "  Water Level: " << mData.mWater << std::endl;
+    }
+    else 
+        std::cout << "  Map Color: " << boost::format("0x%08X") % mData.mMapColor << std::endl;
+    std::cout << "  Water Level Int: " << mData.mWaterInt << std::endl;
+    std::cout << "  NAM0: " << mData.mNAM0 << std::endl;
+
 }
 
 template<>
@@ -295,37 +439,128 @@ void Record<ESM::Class>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
     std::cout << "  Description: " << mData.mDescription << std::endl;
+    std::cout << "  Playable: " << mData.mData.mIsPlayable << std::endl;
+    std::cout << "  AutoCalc: " << mData.mData.mCalc << std::endl;
+    std::cout << "  Attribute1: " << mData.mData.mAttribute[0] << std::endl;
+    std::cout << "  Attribute2: " << mData.mData.mAttribute[1] << std::endl;
+    std::cout << "  Specialization: " << mData.mData.mSpecialization << std::endl;
+    for (int i = 0; i != 5; i++)
+        std::cout << "  Major Skill: " << mData.mData.mSkills[i][0] << std::endl;
+    for (int i = 0; i != 5; i++)
+        std::cout << "  Minor Skill: " << mData.mData.mSkills[i][1] << std::endl;
 }
 
 template<>
 void Record<ESM::Clothing>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    if (mData.mEnchant != "")
+        std::cout << "  Enchantment: " << mData.mEnchant << std::endl;
+    std::cout << "  Type: " << mData.mData.mType << std::endl;
+    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+    std::cout << "  Value: " << mData.mData.mValue << std::endl;
+    // mEnchant also in CTDTstruct?
 }
 
 template<>
 void Record<ESM::Container>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    std::cout << "  Flags: " << mData.mFlags << std::endl;
+    std::cout << "  Weight: " << mData.mWeight << std::endl;
+    std::vector<ESM::ContItem>::iterator cit;
+    for (cit = mData.mInventory.mList.begin(); cit != mData.mInventory.mList.end(); cit++)
+        std::cout << "  Inventory: Count: " << boost::format("%4d") % cit->mCount 
+                  << " Item: " << cit->mItem.toString() << std::endl;
 }
 
 template<>
 void Record<ESM::Creature>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Script: " << mData.mScript << std::endl;
+    std::cout << "  Flags: " << mData.mFlags << std::endl;
+    std::cout << "  Original: " << mData.mOriginal << std::endl;
+    std::cout << "  Scale: " << mData.mScale << std::endl;
+
+    std::cout << "  Type: " << mData.mData.mType << std::endl;
+    std::cout << "  Level: " << mData.mData.mLevel << std::endl;
+
+    std::cout << "  Attributes:" << std::endl;
+    std::cout << "    Strength: " << mData.mData.mStrength << std::endl;
+    std::cout << "    Intelligence: " << mData.mData.mIntelligence << std::endl;
+    std::cout << "    Willpower: " << mData.mData.mWillpower << std::endl;
+    std::cout << "    Agility: " << mData.mData.mAgility << std::endl;
+    std::cout << "    Speed: " << mData.mData.mSpeed << std::endl;
+    std::cout << "    Endurance: " << mData.mData.mEndurance << std::endl;
+    std::cout << "    Personality: " << mData.mData.mPersonality << std::endl;
+    std::cout << "    Luck: " << mData.mData.mLuck << std::endl;
+
+    std::cout << "  Health: " << mData.mData.mHealth << std::endl;
+    std::cout << "  Magicka: " << mData.mData.mMana << std::endl;
+    std::cout << "  Fatigue: " << mData.mData.mFatigue << std::endl;
+    std::cout << "  Soul: " << mData.mData.mSoul << std::endl;
+    std::cout << "  Combat: " << mData.mData.mCombat << std::endl;
+    std::cout << "  Magic: " << mData.mData.mMagic << std::endl;
+    std::cout << "  Stealth: " << mData.mData.mStealth << std::endl;
+    std::cout << "  Attack1: " << mData.mData.mAttack[0] 
+              << "-" <<  mData.mData.mAttack[1] << std::endl;
+    std::cout << "  Attack2: " << mData.mData.mAttack[2] 
+              << "-" <<  mData.mData.mAttack[3] << std::endl;
+    std::cout << "  Attack3: " << mData.mData.mAttack[4] 
+              << "-" <<  mData.mData.mAttack[5] << std::endl;
+    std::cout << "  Gold: " << mData.mData.mGold << std::endl;
+
+    std::vector<ESM::ContItem>::iterator cit;
+    for (cit = mData.mInventory.mList.begin(); cit != mData.mInventory.mList.end(); cit++)
+        std::cout << "  Inventory: Count: " << boost::format("%4d") % cit->mCount 
+                  << " Item: " << cit->mItem.toString() << std::endl;
+
+    std::vector<std::string>::iterator sit;
+    for (sit = mData.mSpells.mList.begin(); sit != mData.mSpells.mList.end(); sit++)
+        std::cout << "  Spell: " << *sit << std::endl;
+
+    std::cout << "  Artifical Intelligence: " << mData.mHasAI << std::endl;
+    std::cout << "    AI Hello:" << (int)mData.mAiData.mHello << std::endl;
+    std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
+    std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
+    std::cout << "    AI Alarm:" << (int)mData.mAiData.mAlarm << std::endl;
+    std::cout << "    AI U1:" << (int)mData.mAiData.mU1 << std::endl;
+    std::cout << "    AI U2:" << (int)mData.mAiData.mU2 << std::endl;
+    std::cout << "    AI U3:" << (int)mData.mAiData.mU3 << std::endl;
+    std::cout << "    AI U4:" << (int)mData.mAiData.mU4 << std::endl;
+    std::cout << "    AI Services:" << boost::format("0x%08X") % mData.mAiData.mServices << std::endl;
+
+    std::vector<ESM::AIPackage>::iterator pit;
+    for (pit = mData.mAiPackage.mList.begin(); pit != mData.mAiPackage.mList.end(); pit++)
+        printAIPackage(*pit);
 }
 
 template<>
 void Record<ESM::Dialogue>::print()
 {
-    // nothing to print
+    std::cout << "  Type: " << (int)mData.mType << std::endl;
+    // Sadly, there are no DialInfos, because the loader dumps as it
+    // loads, rather than loading and then dumping. :-( Anyone mind if
+    // I change this?
+    std::vector<ESM::DialInfo>::iterator iit;
+    for (iit = mData.mInfo.begin(); iit != mData.mInfo.end(); iit++)
+        std::cout << "INFO!" << iit->mId << std::endl;
 }
 
 template<>
 void Record<ESM::Door>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Mesh: " << mData.mModel << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Script: " << mData.mScript << std::endl;
     std::cout << "  OpenSound: " << mData.mOpenSound << std::endl;
     std::cout << "  CloseSound: " << mData.mCloseSound << std::endl;
@@ -334,22 +569,51 @@ void Record<ESM::Door>::print()
 template<>
 void Record<ESM::Enchantment>::print()
 {
-    // nothing to print
+    std::cout << "  Type: " << mData.mData.mType << std::endl;
+    std::cout << "  Cost: " << mData.mData.mCost << std::endl;
+    std::cout << "  Charge: " << mData.mData.mCharge << std::endl;
+    std::cout << "  AutoCalc: " << mData.mData.mAutocalc << std::endl;
+    printEffectList(mData.mEffects);
 }
 
 template<>
 void Record<ESM::Faction>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Attr1: " << mData.mData.mAttribute1 << std::endl;
-    std::cout << "  Attr2: " << mData.mData.mAttribute2 << std::endl;
     std::cout << "  Hidden: " << mData.mData.mIsHidden << std::endl;
+    if (mData.mData.mUnknown != -1)
+        std::cout << "  Unknown: " << mData.mData.mUnknown << std::endl;
+    std::cout << "  Attribute1: " << mData.mData.mAttribute1 << std::endl;
+    std::cout << "  Attribute2: " << mData.mData.mAttribute2 << std::endl;
+    for (int i = 0; i != 6; i++)
+        if (mData.mData.mSkillID[i] != -1)
+            std::cout << "  Skill: " << mData.mData.mSkillID[i] << std::endl;
+    for (int i = 0; i != 10; i++)
+        if (mData.mRanks[i] != "")
+        {
+            std::cout << "  Rank: " << mData.mRanks[i] << std::endl;
+            std::cout << "    Attribute1 Requirement: " 
+                      << mData.mData.mRankData[i].mAttribute1 << std::endl;
+            std::cout << "    Attribute2 Requirement: " 
+                      << mData.mData.mRankData[i].mAttribute2 << std::endl;
+            std::cout << "    One Skill at Level: "
+                      << mData.mData.mRankData[i].mSkill1 << std::endl;
+            std::cout << "    Two Skills at Level: " 
+                      << mData.mData.mRankData[i].mSkill2 << std::endl;
+            std::cout << "    Faction Reaction: " 
+                      << mData.mData.mRankData[i].mFactReaction << std::endl;
+        }
+    std::vector<ESM::Faction::Reaction>::iterator rit;
+    for (rit = mData.mReactions.begin(); rit != mData.mReactions.end(); rit++)
+        std::cout << "  Reaction: " << rit->mReaction << " = " << rit->mFaction << std::endl;
 }
 
 template<>
 void Record<ESM::Global>::print()
 {
-    // nothing to print
+    // nothing to print (well, nothing that's correct anyway)
+    std::cout << "  Type: " << mData.mType << std::endl;
+    std::cout << "  Value: " << mData.mValue << std::endl;
 }
 
 template<>
@@ -379,68 +643,192 @@ template<>
 void Record<ESM::DialInfo>::print()
 {
     std::cout << "  Id: " << mData.mId << std::endl;
+    if (mData.mPrev != "")
+        std::cout << "  Previous ID: " << mData.mPrev << std::endl;
+    if (mData.mNext != "")
+        std::cout << "  Next ID: " << mData.mNext << std::endl;
     std::cout << "  Text: " << mData.mResponse << std::endl;
+    if (mData.mActor != "")
+        std::cout << "  Actor: " << mData.mActor << std::endl;
+    if (mData.mRace != "")
+        std::cout << "  Race: " << mData.mRace << std::endl;
+    if (mData.mClass != "")
+        std::cout << "  Class: " << mData.mClass << std::endl;
+    std::cout << "  Factionless: " << mData.mFactionLess << std::endl;
+    if (mData.mNpcFaction != "")
+        std::cout << "  NPC Faction: " << mData.mNpcFaction << std::endl;
+    if (mData.mData.mRank != -1)
+        std::cout << "  NPC Rank: " << (int)mData.mData.mRank << std::endl;
+    if (mData.mPcFaction != "")
+        std::cout << "  PC Faction: " << mData.mPcFaction << std::endl;
+    // CHANGE? non-standard capitalization mPCrank -> mPCRank (mPcRank?)
+    if (mData.mData.mPCrank != -1)
+        std::cout << "  PC Rank: " << (int)mData.mData.mPCrank << std::endl;
+    if (mData.mCell != "")
+        std::cout << "  Cell: " << mData.mCell << std::endl;
+    if (mData.mData.mDisposition > 0)
+        std::cout << "  Disposition: " << mData.mData.mDisposition << std::endl;
+    if (mData.mData.mGender != ESM::DialInfo::NA)
+        std::cout << "  Gender: " << mData.mData.mGender << std::endl;
+    if (mData.mSound != "")
+        std::cout << "  Sound File: " << mData.mSound << std::endl;
+
+    if (mData.mResultScript != "")
+    {
+        std::cout << "  Result Script: [skipped]" << std::endl;
+        // Skip until multi-line fields is controllable by a command line option.
+        // Mildly problematic because there are no parameter to print() currently.
+        // std::cout << "-------------------------------------------" << std::endl;
+        // std::cout << mData.mResultScript << std::endl;
+        // std::cout << "-------------------------------------------" << std::endl;
+    }
+
+    std::cout << "  Quest Status: " << mData.mQuestStatus << std::endl;
+    std::cout << "  Unknown1: " << mData.mData.mUnknown1 << std::endl;
+    std::cout << "  Unknown2: " << (int)mData.mData.mUnknown2 << std::endl;
+
+    std::vector<ESM::DialInfo::SelectStruct>::iterator sit;
+    for (sit = mData.mSelects.begin(); sit != mData.mSelects.end(); sit++)
+        std::cout << "  Select Rule: " << sit->mType << " " << sit->mSelectRule << std::endl;
 }
 
 template<>
 void Record<ESM::Ingredient>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
+    for (int i = 0; i !=4; i++)
+    {
+        // A value of -1 means no effect
+        if (mData.mData.mEffectID[i] == -1) continue;
+        std::cout << "  Effect: " << mData.mData.mEffectID[i] << std::endl;
+        std::cout << "  Skill: " << mData.mData.mSkills[i] << std::endl;
+        std::cout << "  Attribute: " << mData.mData.mAttributes[i] << std::endl;
+    }
 }
 
 template<>
 void Record<ESM::Land>::print()
 {
-    std::cout << "  Coords: [" << mData.mX << "," << mData.mY << "]" << std::endl;
+    std::cout << "  Coordinates: (" << mData.mX << "," << mData.mY << ")" << std::endl;
+    std::cout << "  Flags: " << mData.mFlags << std::endl;
+    std::cout << "  HasData: " << mData.mHasData << std::endl;
+    std::cout << "  DataTypes: " << mData.mDataTypes << std::endl;
+
+    // Seems like this should done with reference counting in the
+    // loader to me.  But I'm not really knowledgable about this
+    // record type yet. --Cory
+    bool wasLoaded = mData.mDataLoaded;
+    if (mData.mDataTypes) mData.loadData(mData.mDataTypes);
+    if (mData.mDataLoaded)
+    {
+        std::cout << "  Height Offset: " << mData.mLandData->mHeightOffset << std::endl;
+        // Lots of missing members.
+        std::cout << "  Unknown1: " << mData.mLandData->mUnk1 << std::endl;
+        std::cout << "  Unknown2: " << mData.mLandData->mUnk2 << std::endl;
+    }
+    if (!wasLoaded) mData.unloadData();
 }
 
 template<>
 void Record<ESM::CreatureLevList>::print()
 {
+    std::cout << "  Chance for None: " << (int)mData.mChanceNone << std::endl;
+    std::cout << "  Flags: " << mData.mFlags << std::endl;
     std::cout << "  Number of items: " << mData.mList.size() << std::endl;
+    std::vector<ESM::LeveledListBase::LevelItem>::iterator iit;
+    for (iit = mData.mList.begin(); iit != mData.mList.end(); iit++)
+        std::cout << "  Creature: Level: " << iit->mLevel 
+                  << " Creature: " << iit->mId << std::endl;
 }
 
 template<>
 void Record<ESM::ItemLevList>::print()
 {
+    std::cout << "  Chance for None: " << (int)mData.mChanceNone << std::endl;
+    std::cout << "  Flags: " << mData.mFlags << std::endl;
     std::cout << "  Number of items: " << mData.mList.size() << std::endl;
+    std::vector<ESM::LeveledListBase::LevelItem>::iterator iit;
+    for (iit = mData.mList.begin(); iit != mData.mList.end(); iit++)
+        std::cout << "  Inventory: Count: " << iit->mLevel
+                  << " Item: " << iit->mId << std::endl;
 }
 
 template<>
 void Record<ESM::Light>::print()
 {
+    if (mData.mName != "")
         std::cout << "  Name: " << mData.mName << std::endl;
+    if (mData.mModel != "")
+        std::cout << "  Model: " << mData.mModel << std::endl;
+    if (mData.mIcon != "")
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    std::cout << "  Flags: " << mData.mData.mFlags << std::endl;
     std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
+    std::cout << "  Sound: " << mData.mSound << std::endl;
+    std::cout << "  Duration: " << mData.mData.mTime << std::endl;
+    std::cout << "  Radius: " << mData.mData.mRadius << std::endl;
+    std::cout << "  Color: " << mData.mData.mColor << std::endl;
 }
 
 template<>
 void Record<ESM::Tool>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    std::cout << "  Type: " << mData.mType << std::endl;
+    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+    std::cout << "  Value: " << mData.mData.mValue << std::endl;
     std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
+    std::cout << "  Uses: " << mData.mData.mUses << std::endl;
 }
 
 template<>
 void Record<ESM::Probe>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    std::cout << "  Type: " << mData.mType << std::endl;
+    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+    std::cout << "  Value: " << mData.mData.mValue << std::endl;
     std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
+    std::cout << "  Uses: " << mData.mData.mUses << std::endl;
 }
 
 template<>
 void Record<ESM::Repair>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    std::cout << "  Type: " << mData.mType << std::endl;
+    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
+    std::cout << "  Value: " << mData.mData.mValue << std::endl;
     std::cout << "  Quality: " << mData.mData.mQuality << std::endl;
+    std::cout << "  Uses: " << mData.mData.mUses << std::endl;
 }
 
 template<>
 void Record<ESM::LandTexture>::print()
 {
     std::cout << "  Id: " << mData.mId << std::endl;
+    std::cout << "  Index: " << mData.mIndex << std::endl;
     std::cout << "  Texture: " << mData.mTexture << std::endl;
 }
 
@@ -448,53 +836,295 @@ template<>
 void Record<ESM::MagicEffect>::print()
 {
     std::cout << "  Index: " << mData.mIndex << std::endl;
-
+    std::cout << "  Description: " << mData.mDescription << std::endl;
-    const char *text = "Positive";
+    std::cout << "  Icon: " << mData.mIcon << std::endl;
-    if (mData.mData.mFlags & ESM::MagicEffect::Negative) {
+    std::cout << "  Flags: " << mData.mData.mFlags << std::endl;
-        text = "Negative";
+    std::cout << "  Particle Texture: " << mData.mParticle << std::endl;
-    }
+    if (mData.mCasting != "")
-    std::cout << "  " << text << std::endl;
+        std::cout << "  Casting Static: " << mData.mCasting << std::endl;
+    if (mData.mCastSound != "")
+        std::cout << "  Casting Sound: " << mData.mCastSound << std::endl;
+    if (mData.mBolt != "")
+        std::cout << "  Bolt Static: " << mData.mBolt << std::endl;
+    if (mData.mBoltSound != "")
+        std::cout << "  Bolt Sound: " << mData.mBoltSound << std::endl;
+    if (mData.mHit != "")
+        std::cout << "  Hit Static: " << mData.mHit << std::endl;
+    if (mData.mHitSound != "")
+        std::cout << "  Hit Sound: " << mData.mHitSound << std::endl;
+    if (mData.mArea != "")
+        std::cout << "  Area Static: " << mData.mArea << std::endl;
+    if (mData.mAreaSound != "")
+        std::cout << "  Area Sound: " << mData.mAreaSound << std::endl;
+    std::cout << "  School: " << mData.mData.mSchool << std::endl;
+    std::cout << "  Base Cost: " << mData.mData.mBaseCost << std::endl;
+    std::cout << "  Speed: " << mData.mData.mSpeed << std::endl;
+    std::cout << "  Size: " << mData.mData.mSize << std::endl;
+    std::cout << "  Size Cap: " << mData.mData.mSizeCap << std::endl;
+    std::cout << "  RGB Color: " << "("
+              << mData.mData.mRed << ","
+              << mData.mData.mGreen << ","
+              << mData.mData.mGreen << ")" << std::endl;
 }
 
 template<>
 void Record<ESM::Miscellaneous>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
+    std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
+    std::cout << "  Is Key: " << mData.mData.mIsKey << std::endl;
 }
 
 template<>
 void Record<ESM::NPC>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Animation: " << mData.mModel << std::endl;
+    std::cout << "  Hair Model: " << mData.mHair << std::endl;
+    std::cout << "  Head Model: " << mData.mHead << std::endl;
     std::cout << "  Race: " << mData.mRace << std::endl;
+    std::cout << "  Class: " << mData.mClass << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    if (mData.mFaction != "")
+        std::cout << "  Faction: " << mData.mFaction << std::endl;
+    std::cout << "  Flags: " << mData.mFlags << std::endl;
+
+    // Seriously?
+    if (mData.mNpdt52.mGold == -10)
+    {
+        std::cout << "  Level: " << mData.mNpdt12.mLevel << std::endl;
+        std::cout << "  Reputation: " << (int)mData.mNpdt12.mReputation << std::endl;
+        std::cout << "  Disposition: " << (int)mData.mNpdt12.mDisposition << std::endl;
+        std::cout << "  Faction: " << (int)mData.mNpdt52.mFactionID << std::endl;
+        std::cout << "  Rank: " << (int)mData.mNpdt12.mRank << std::endl;
+        std::cout << "  Unknown1: " 
+                  << (unsigned int)((unsigned char)mData.mNpdt12.mUnknown1) << std::endl;
+        std::cout << "  Unknown2: " 
+                  << (unsigned int)((unsigned char)mData.mNpdt12.mUnknown2) << std::endl;
+        std::cout << "  Unknown3: " 
+                  << (unsigned int)((unsigned char)mData.mNpdt12.mUnknown3) << std::endl;
+        std::cout << "  Gold: " << (int)mData.mNpdt12.mGold << std::endl;
+    }
+    else {
+        std::cout << "  Level: " << mData.mNpdt52.mLevel << std::endl;
+        std::cout << "  Reputation: " << (int)mData.mNpdt52.mReputation << std::endl;
+        std::cout << "  Disposition: " << (int)mData.mNpdt52.mDisposition << std::endl;
+        std::cout << "  Rank: " << (int)mData.mNpdt52.mRank << std::endl;
+
+        std::cout << "  Attributes:" << std::endl;
+        std::cout << "    Strength: " << (int)mData.mNpdt52.mStrength << std::endl;
+        std::cout << "    Intelligence: " << (int)mData.mNpdt52.mIntelligence << std::endl;
+        std::cout << "    Willpower: " << (int)mData.mNpdt52.mWillpower << std::endl;
+        std::cout << "    Agility: " << (int)mData.mNpdt52.mAgility << std::endl;
+        std::cout << "    Speed: " << (int)mData.mNpdt52.mSpeed << std::endl;
+        std::cout << "    Endurance: " << (int)mData.mNpdt52.mEndurance << std::endl;
+        std::cout << "    Personality: " << (int)mData.mNpdt52.mPersonality << std::endl;
+        std::cout << "    Luck: " << (int)mData.mNpdt52.mLuck << std::endl;
+
+        std::cout << "  Skills:" << std::endl;
+        for (int i = 0; i != 27; i++)
+            std::cout << "    " << i << " = " 
+                      << (int)((unsigned char)mData.mNpdt52.mSkills[i]) << std::endl;   
+        
+        std::cout << "  Health: " << mData.mNpdt52.mHealth << std::endl;
+        std::cout << "  Magicka: " << mData.mNpdt52.mMana << std::endl;
+        std::cout << "  Fatigue: " << mData.mNpdt52.mFatigue << std::endl;
+        std::cout << "  Unknown: " << (int)mData.mNpdt52.mUnknown << std::endl;
+        std::cout << "  Gold: " << mData.mNpdt52.mGold << std::endl;
+    }
+
+    std::vector<ESM::ContItem>::iterator cit;
+    for (cit = mData.mInventory.mList.begin(); cit != mData.mInventory.mList.end(); cit++)
+        std::cout << "  Inventory: Count: " << boost::format("%4d") % cit->mCount 
+                  << " Item: " << cit->mItem.toString() << std::endl;
+    
+    std::vector<std::string>::iterator sit;
+    for (sit = mData.mSpells.mList.begin(); sit != mData.mSpells.mList.end(); sit++)
+        std::cout << "  Spell: " << *sit << std::endl;
+
+    std::vector<ESM::NPC::Dest>::iterator dit;
+    for (dit = mData.mTransport.begin(); dit != mData.mTransport.end(); dit++)
+    {
+        std::cout << "  Destination Position: " 
+                  << boost::format("%12.3f") % dit->mPos.pos[0] << ","
+                  << boost::format("%12.3f") % dit->mPos.pos[1] << ","
+                  << boost::format("%12.3f") % dit->mPos.pos[2] << ")" << std::endl;
+        std::cout << "  Destination Rotation: " 
+                  << boost::format("%9.6f") % dit->mPos.rot[0] << ","
+                  << boost::format("%9.6f") % dit->mPos.rot[1] << ","
+                  << boost::format("%9.6f") % dit->mPos.rot[2] << ")" << std::endl;             
+        if (dit->mCellName != "")
+            std::cout << "  Destination Cell: " << dit->mCellName << std::endl;
+    }
+    
+    std::cout << "  Artifical Intelligence: " << mData.mHasAI << std::endl;
+    std::cout << "    AI Hello:" << (int)mData.mAiData.mHello << std::endl;
+    std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
+    std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
+    std::cout << "    AI Alarm:" << (int)mData.mAiData.mAlarm << std::endl;
+    std::cout << "    AI U1:" << (int)mData.mAiData.mU1 << std::endl;
+    std::cout << "    AI U2:" << (int)mData.mAiData.mU2 << std::endl;
+    std::cout << "    AI U3:" << (int)mData.mAiData.mU3 << std::endl;
+    std::cout << "    AI U4:" << (int)mData.mAiData.mU4 << std::endl;
+    std::cout << "    AI Services:" << boost::format("0x%08X") % mData.mAiData.mServices << std::endl;
+
+    std::vector<ESM::AIPackage>::iterator pit;
+    for (pit = mData.mAiPackage.mList.begin(); pit != mData.mAiPackage.mList.end(); pit++)
+        printAIPackage(*pit);
 }
 
 template<>
 void Record<ESM::Pathgrid>::print()
 {
     std::cout << "  Cell: " << mData.mCell << std::endl;
-    std::cout << "  Point count: " << mData.mPoints.size() << std::endl;
+    std::cout << "  Coordinates: (" << mData.mData.mX << "," << mData.mData.mY << ")" << std::endl;
-    std::cout << "  Edge count: " << mData.mEdges.size() << std::endl;
+    std::cout << "  Unknown S1: " << mData.mData.mS1 << std::endl;
+    if ((unsigned int)mData.mData.mS2 != mData.mPoints.size())
+        std::cout << "  Reported Point Count: " << mData.mData.mS2 << std::endl;
+    std::cout << "  Point Count: " << mData.mPoints.size() << std::endl;
+    std::cout << "  Edge Count: " << mData.mEdges.size() << std::endl;
+
+    int i = 0;
+    ESM::Pathgrid::PointList::iterator pit;
+    for (pit = mData.mPoints.begin(); pit != mData.mPoints.end(); pit++)
+    {
+        std::cout << "  Point[" << i << "]:" << std::endl;
+        std::cout << "    Coordinates: (" << pit->mX << "," 
+             << pit->mY << "," << pit->mZ << ")" << std::endl;
+        std::cout << "    Auto-Generated: " << (int)pit->mAutogenerated << std::endl;
+        std::cout << "    Connections: " << (int)pit->mConnectionNum << std::endl;
+        std::cout << "    Unknown: " << pit->mUnknown << std::endl;
+        i++;
+    }
+    i = 0;
+    ESM::Pathgrid::EdgeList::iterator eit;
+    for (eit = mData.mEdges.begin(); eit != mData.mEdges.end(); eit++)
+    {
+        std::cout << "  Edge[" << i << "]: " << eit->mV0 << " -> " << eit->mV1 << std::endl;
+        if (eit->mV0 >= mData.mData.mS2 || eit->mV1 >= mData.mData.mS2)
+            std::cout << "  BAD POINT IN EDGE!" << std::endl;
+        i++;
+    }
 }
 
 template<>
 void Record<ESM::Race>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Length: " << mData.mData.mHeight.mMale << "m " << mData.mData.mHeight.mFemale << "f" << std::endl;
+    std::cout << "  Description: " << mData.mDescription << std::endl;
+    std::cout << "  Flags: " << mData.mData.mFlags << std::endl;
+
+    std::cout << "  Male:" << std::endl;
+    std::cout << "    Strength: "
+              << mData.mData.mStrength.mMale << std::endl;
+    std::cout << "    Intelligence: "
+              << mData.mData.mIntelligence.mMale << std::endl;
+    std::cout << "    Willpower: "
+              << mData.mData.mWillpower.mMale << std::endl;
+    std::cout << "    Agility: "
+              << mData.mData.mAgility.mMale << std::endl;
+    std::cout << "    Speed: "
+              << mData.mData.mSpeed.mMale << std::endl;
+    std::cout << "    Endurance: "
+              << mData.mData.mEndurance.mMale << std::endl;
+    std::cout << "    Personality: "
+              << mData.mData.mPersonality.mMale << std::endl;
+    std::cout << "    Luck: "
+              << mData.mData.mLuck.mMale << std::endl;
+    std::cout << "    Height: "
+              << mData.mData.mHeight.mMale << std::endl;
+    std::cout << "    Weight: "
+              << mData.mData.mWeight.mMale << std::endl;
+
+    std::cout << "  Female:" << std::endl;
+    std::cout << "    Strength: "
+              << mData.mData.mStrength.mFemale << std::endl;
+    std::cout << "    Intelligence: "
+              << mData.mData.mIntelligence.mFemale << std::endl;
+    std::cout << "    Willpower: "
+              << mData.mData.mWillpower.mFemale << std::endl;
+    std::cout << "    Agility: "
+              << mData.mData.mAgility.mFemale << std::endl;
+    std::cout << "    Speed: "
+              << mData.mData.mSpeed.mFemale << std::endl;
+    std::cout << "    Endurance: "
+              << mData.mData.mEndurance.mFemale << std::endl;
+    std::cout << "    Personality: "
+              << mData.mData.mPersonality.mFemale << std::endl;
+    std::cout << "    Luck: "
+              << mData.mData.mLuck.mFemale << std::endl;
+    std::cout << "    Height: "
+              << mData.mData.mHeight.mFemale << std::endl;
+    std::cout << "    Weight: "
+              << mData.mData.mWeight.mFemale << std::endl;
+
+    for (int i = 0; i != 7; i++)
+        // Not all races have 7 skills.
+        if (mData.mData.mBonus[i].mSkill != -1)
+            std::cout << "  Skill: " << mData.mData.mBonus[i].mSkill
+                      << " = " << mData.mData.mBonus[i].mBonus << std::endl;
+
+    std::vector<std::string>::iterator sit;
+    for (sit = mData.mPowers.mList.begin(); sit != mData.mPowers.mList.end(); sit++)
+        std::cout << "  Power: " << *sit << std::endl;
 }
 
 template<>
 void Record<ESM::Region>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+
+    std::cout << "  Weather:" << std::endl;
+    std::cout << "    Clear: " << (int)mData.mData.mClear << std::endl;
+    std::cout << "    Cloudy: " << (int)mData.mData.mCloudy << std::endl;
+    std::cout << "    Foggy: " << (int)mData.mData.mFoggy << std::endl;
+    std::cout << "    Overcast: " << (int)mData.mData.mOvercast << std::endl;
+    std::cout << "    Rain: " << (int)mData.mData.mOvercast << std::endl;
+    std::cout << "    Thunder: " << (int)mData.mData.mThunder << std::endl;
+    std::cout << "    Ash: " << (int)mData.mData.mAsh << std::endl;
+    std::cout << "    Blight: " << (int)mData.mData.mBlight << std::endl;
+    std::cout << "    UnknownA: " << (int)mData.mData.mA << std::endl;
+    std::cout << "    UnknownB: " << (int)mData.mData.mB << std::endl;
+    std::cout << "  Map Color: " << mData.mMapColor << std::endl;
+    if (mData.mSleepList != "")
+        std::cout << "  Sleep List: " << mData.mSleepList << std::endl;
+    std::vector<ESM::Region::SoundRef>::iterator sit;
+    for (sit = mData.mSoundList.begin(); sit != mData.mSoundList.end(); sit++)
+        std::cout << "  Sound: " << (int)sit->mChance << " = " << sit->mSound.toString() << std::endl;
 }
 
 template<>
 void Record<ESM::Script>::print()
 {
     std::cout << "  Name: " << mData.mData.mName.toString() << std::endl;
+
+    std::cout << "  Num Shorts: " << mData.mData.mNumShorts << std::endl;
+    std::cout << "  Num Longs: " << mData.mData.mNumLongs << std::endl;
+    std::cout << "  Num Floats: " << mData.mData.mNumFloats << std::endl;
+    std::cout << "  Script Data Size: " << mData.mData.mScriptDataSize << std::endl;
+    std::cout << "  Table Size: " << mData.mData.mStringTableSize << std::endl;
+
+    std::cout << "  Script: [skipped]" << std::endl;
+    // Skip until multi-line fields is controllable by a command line option.
+    // Mildly problematic because there are no parameter to print() currently.
+    // std::cout << "-------------------------------------------" << std::endl;
+    // std::cout << s->scriptText << std::endl;
+    // std::cout << "-------------------------------------------" << std::endl;
+    std::vector<std::string>::iterator vit;
+    for (vit = mData.mVarNames.begin(); vit != mData.mVarNames.end(); vit++)
+        std::cout << "  Variable: " << *vit << std::endl;
+
+    std::cout << "  ByteCode: ";
+    std::vector<char>::iterator cit;
+    for (cit = mData.mScriptData.begin(); cit != mData.mScriptData.end(); cit++)
+        std::cout << boost::format("%02X") % (int)(*cit);
+    std::cout << std::endl;
 }
 
 template<>
@@ -519,25 +1149,34 @@ void Record<ESM::SoundGenerator>::print()
 {
     std::cout << "  Creature: " << mData.mCreature << std::endl;
     std::cout << "  Sound: " << mData.mSound << std::endl;
+    std::cout << "  Type: " << mData.mType << std::endl;
 }
 
 template<>
 void Record<ESM::Sound>::print()
 {
     std::cout << "  Sound: " << mData.mSound << std::endl;
-    std::cout << "  Volume: " << mData.mData.mVolume << std::endl;
+    std::cout << "  Volume: " << (int)mData.mData.mVolume << std::endl;
+    if (mData.mData.mMinRange != 0 && mData.mData.mMaxRange != 0)
+        std::cout << "  Range: " << (int)mData.mData.mMinRange << " - " 
+                  << (int)mData.mData.mMaxRange << std::endl;
 }
 
 template<>
 void Record<ESM::Spell>::print()
 {
     std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Type: " << mData.mData.mType << std::endl;
+    std::cout << "  Flags: " << mData.mData.mFlags << std::endl;
+    std::cout << "  Cost: " << mData.mData.mCost << std::endl;
+    printEffectList(mData.mEffects);
 }
 
 template<>
 void Record<ESM::StartScript>::print()
 {
-    std::cout << "Start script: " << mData.mScript << std::endl;
+    std::cout << "Start Script: " << mData.mScript << std::endl;
+    std::cout << "Start Data: " << mData.mData << std::endl;
 }
 
 template<>
@@ -549,11 +1188,34 @@ void Record<ESM::Static>::print()
 template<>
 void Record<ESM::Weapon>::print()
 {
+    // No names on VFX bolts
+    if (mData.mName != "")
         std::cout << "  Name: " << mData.mName << std::endl;
-    std::cout << "  Chop: " << mData.mData.mChop[0] << "-" << mData.mData.mChop[1] << std::endl;
+    std::cout << "  Model: " << mData.mModel << std::endl;
-    std::cout << "  Slash: " << mData.mData.mSlash[0] << "-" << mData.mData.mSlash[1] << std::endl;
+    // No icons on VFX bolts or magic bolts
-    std::cout << "  Thrust: " << mData.mData.mThrust[0] << "-" << mData.mData.mThrust[1] << std::endl;
+    if (mData.mIcon != "")
+        std::cout << "  Icon: " << mData.mIcon << std::endl;
+    if (mData.mScript != "")
+        std::cout << "  Script: " << mData.mScript << std::endl;
+    if (mData.mEnchant != "")
+        std::cout << "  Enchantment: " << mData.mEnchant << std::endl;    
+    std::cout << "  Type: " << mData.mData.mType << std::endl;
+    std::cout << "  Flags: " << mData.mData.mFlags << std::endl;
+    std::cout << "  Weight: " << mData.mData.mWeight << std::endl;
     std::cout << "  Value: " << mData.mData.mValue << std::endl;
+    std::cout << "  Health: " << mData.mData.mHealth << std::endl;
+    std::cout << "  Speed: " << mData.mData.mSpeed << std::endl;
+    std::cout << "  Reach: " << mData.mData.mReach << std::endl;
+    std::cout << "  Enchantment Points: " << mData.mData.mEnchant << std::endl;
+    if (mData.mData.mChop[0] != 0 && mData.mData.mChop[1] != 0)
+        std::cout << "  Chop: " << (int)mData.mData.mChop[0] << "-" 
+                  << (int)mData.mData.mChop[1] << std::endl;
+    if (mData.mData.mSlash[0] != 0 && mData.mData.mSlash[1] != 0)
+        std::cout << "  Slash: " << (int)mData.mData.mSlash[0] << "-"
+                  << (int)mData.mData.mSlash[1] << std::endl;
+    if (mData.mData.mThrust[0] != 0 && mData.mData.mThrust[1] != 0)
+        std::cout << "  Thrust: " << (int)mData.mData.mThrust[0] << "-" 
+                  << (int)mData.mData.mThrust[1] << std::endl;
 }
 
 template<>

apps/esmtool/record.hpp

@@ -20,7 +20,7 @@ namespace EsmTool
     protected:
         std::string mId;
         int mFlags;
-        int mType;
+        ESM::NAME mType;
 
     public:
         RecordBase () {}
@@ -42,7 +42,7 @@ namespace EsmTool
             mFlags = flags;
         }
 
-        int getType() const {
+        ESM::NAME getType() const {
             return mType;
         }
 
@@ -50,7 +50,7 @@ namespace EsmTool
         virtual void save(ESM::ESMWriter &esm) = 0;
         virtual void print() = 0;
 
-        static RecordBase *create(int type);
+        static RecordBase *create(ESM::NAME type);
 
         // just make it a bit shorter
         template <class T>