From 4034c3f9f5efeb95828241eec143bdf057a8d0ee Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Mon, 14 May 2018 20:16:40 -0400
Subject: [PATCH 01/86] Remove abstract="0" as it is the default

---
 nif.xml | 530 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 265 insertions(+), 265 deletions(-)

diff --git a/nif.xml b/nif.xml
index 68cc56d..fcd303b 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2182,7 +2182,7 @@
         Abstract object type.
     </niobject>
 
-    <niobject name="Ni3dsAlphaAnimator" abstract="0" inherit="NiObject">
+    <niobject name="Ni3dsAlphaAnimator" inherit="NiObject">
         Unknown.
         <add name="Unknown 1" type="byte" arr1="40">Unknown.</add>
         <add name="Parent" type="Ref" template="NiObject">The parent?</add>
@@ -2191,7 +2191,7 @@
         <add name="Unknown 2" type="uint" arr1="Num 1" arr2="Num 2" arr3="2">Unknown.</add>
     </niobject>
 
-    <niobject name="Ni3dsAnimationNode" abstract="0" inherit="NiObject">
+    <niobject name="Ni3dsAnimationNode" inherit="NiObject">
         Unknown. Only found in 2.3 nifs.
         <add name="Name" type="string">Name of this object.</add>
         <add name="Has Data" type="bool">Unknown.</add>
@@ -2203,22 +2203,22 @@
         <add name="Unknown Array" type="byte" arr1="Count" arr2="5" cond="Has Data">Unknown.</add>
     </niobject>
 
-    <niobject name="Ni3dsColorAnimator" abstract="0" inherit="NiObject">
+    <niobject name="Ni3dsColorAnimator" inherit="NiObject">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="184">Unknown.</add>
     </niobject>
 
-    <niobject name="Ni3dsMorphShape" abstract="0" inherit="NiObject">
+    <niobject name="Ni3dsMorphShape" inherit="NiObject">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="14">Unknown.</add>
     </niobject>
 
-    <niobject name="Ni3dsParticleSystem" abstract="0" inherit="NiObject">
+    <niobject name="Ni3dsParticleSystem" inherit="NiObject">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="14">Unknown.</add>
     </niobject>
 
-    <niobject name="Ni3dsPathController" abstract="0" inherit="NiObject">
+    <niobject name="Ni3dsPathController" inherit="NiObject">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="20">Unknown.</add>
     </niobject>
@@ -2281,7 +2281,7 @@
         A Havok phantom that uses a Havok shape object for its collision volume instead of just a bounding box.
     </niobject>
 
-    <niobject name="bhkSimpleShapePhantom" abstract="0" inherit="bhkShapePhantom">
+    <niobject name="bhkSimpleShapePhantom" inherit="bhkShapePhantom">
         Unknown shape.
         <add name="Unused 2" type="byte" arr1="8">Garbage data from memory.</add>
         <add name="Transform" type="Matrix44" />
@@ -2291,7 +2291,7 @@
         A havok node, describes physical properties.
     </niobject>
 
-    <niobject name="bhkRigidBody" abstract="0" inherit="bhkEntity">
+    <niobject name="bhkRigidBody" inherit="bhkEntity">
         This is the default body type for all "normal" usable and static world objects. The "T" suffix
         marks this body as active for translation and rotation, a normal bhkRigidBody ignores those
         properties. Because the properties are equal, a bhkRigidBody may be renamed into a bhkRigidBodyT and vice-versa.
@@ -2349,7 +2349,7 @@
         <add name="Body Flags" type="ushort" vercond="(User Version 2 &gt;= 76)">1 = respond to wind</add>
     </niobject>
 
-    <niobject name="bhkRigidBodyT" abstract="0" inherit="bhkRigidBody">
+    <niobject name="bhkRigidBodyT" inherit="bhkRigidBody">
         The "T" suffix marks this body as active for translation and rotation.
     </niobject>
 
@@ -2360,37 +2360,37 @@
         <add name="Priority" type="uint" default="1">Usually 1. Higher values indicate higher priority of this constraint?</add>
     </niobject>
 
-    <niobject name="bhkLimitedHingeConstraint" abstract="0" inherit="bhkConstraint">
+    <niobject name="bhkLimitedHingeConstraint" inherit="bhkConstraint">
         Hinge constraint.
         <add name="Limited Hinge" type="LimitedHingeDescriptor">Describes a limited hinge constraint</add>
     </niobject>
 
-    <niobject name="bhkMalleableConstraint" abstract="0" inherit="bhkConstraint">
+    <niobject name="bhkMalleableConstraint" inherit="bhkConstraint">
         A malleable constraint.
         <add name="Malleable" type="MalleableDescriptor">Constraint within constraint.</add>
     </niobject>
 
-    <niobject name="bhkStiffSpringConstraint" abstract="0" inherit="bhkConstraint">
+    <niobject name="bhkStiffSpringConstraint" inherit="bhkConstraint">
         A spring constraint.
         <add name="Stiff Spring" type="StiffSpringDescriptor">Stiff Spring constraint.</add>
     </niobject>
 
-    <niobject name="bhkRagdollConstraint" abstract="0" inherit="bhkConstraint">
+    <niobject name="bhkRagdollConstraint" inherit="bhkConstraint">
         Ragdoll constraint.
         <add name="Ragdoll" type="RagdollDescriptor">Ragdoll constraint.</add>
     </niobject>
 
-    <niobject name="bhkPrismaticConstraint" abstract="0" inherit="bhkConstraint">
+    <niobject name="bhkPrismaticConstraint" inherit="bhkConstraint">
         A prismatic constraint.
         <add name="Prismatic" type="PrismaticDescriptor">Describes a prismatic constraint</add>
     </niobject>
 
-    <niobject name="bhkHingeConstraint" abstract="0" inherit="bhkConstraint">
+    <niobject name="bhkHingeConstraint" inherit="bhkConstraint">
         A hinge constraint.
         <add name="Hinge" type="HingeDescriptor">Hinge constraing.</add>
     </niobject>
 
-    <niobject name="bhkBallAndSocketConstraint" abstract="0" inherit="bhkConstraint">
+    <niobject name="bhkBallAndSocketConstraint" inherit="bhkConstraint">
         A Ball and Socket Constraint.
         <add name="Ball and Socket" type="BallAndSocketDescriptor">Describes a ball and socket constraint</add>
     </niobject>
@@ -2401,7 +2401,7 @@
         <add name="Pivot In B" type="Vector4" />
     </compound>
 
-    <niobject name="bhkBallSocketConstraintChain" abstract="0" inherit="bhkSerializable">
+    <niobject name="bhkBallSocketConstraintChain" inherit="bhkSerializable">
         A Ball and Socket Constraint chain.
         <add name="Num Pivots" type="uint">Number of pivot points. Divide by 2 to get the number of constraints.</add>
         <add name="Pivots" type="ConstraintInfo" arr1="Num Pivots / 2">Two pivot points A and B for each constraint.</add>
@@ -2421,7 +2421,7 @@
         A Havok Shape?
     </niobject>
 
-    <niobject name="bhkTransformShape" abstract="0" inherit="bhkShape">
+    <niobject name="bhkTransformShape" inherit="bhkShape">
         Transforms a shape.
         <add name="Shape" type="Ref" template="bhkShape">The shape that this object transforms.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
@@ -2440,11 +2440,11 @@
         A havok shape.
     </niobject>
 
-    <niobject name="bhkSphereShape" abstract="0" inherit="bhkConvexShape">
+    <niobject name="bhkSphereShape" inherit="bhkConvexShape">
         A sphere.
     </niobject>
 
-    <niobject name="bhkCapsuleShape" abstract="0" inherit="bhkConvexShape">
+    <niobject name="bhkCapsuleShape" inherit="bhkConvexShape">
         A capsule.
         <add name="Unused" type="byte" arr1="8">Not used. The following wants to be aligned at 16 bytes.</add>
         <add name="First Point" type="Vector3">First point on the capsule's axis.</add>
@@ -2453,14 +2453,14 @@
         <add name="Radius 2" type="float">Matches second capsule radius.</add>
     </niobject>
 
-    <niobject name="bhkBoxShape" abstract="0" inherit="bhkConvexShape">
+    <niobject name="bhkBoxShape" inherit="bhkConvexShape">
         A box.
         <add name="Unused" type="byte" arr1="8">Not used. The following wants to be aligned at 16 bytes.</add>
         <add name="Dimensions" type="Vector3">A cube stored in Half Extents. A unit cube (1.0, 1.0, 1.0) would be stored as 0.5, 0.5, 0.5.</add>
         <add name="Unused Float" type="float">Unused as Havok stores the Half Extents as hkVector4 with the W component unused.</add>
     </niobject>
 
-    <niobject name="bhkConvexVerticesShape" abstract="0" inherit="bhkConvexShape">
+    <niobject name="bhkConvexVerticesShape" inherit="bhkConvexShape">
         A convex shape built from vertices. Note that if the shape is used in
         a non-static object (such as clutter), then they will simply fall
         through ground when they are under a bhkListShape.
@@ -2473,7 +2473,7 @@
     </niobject>
 
     <!--Should inherit from bhkConvexShape according to hierarchy, but seems to be exactly the same as bhkTransformShape.-->
-    <niobject name="bhkConvexTransformShape" abstract="0" inherit="bhkTransformShape">
+    <niobject name="bhkConvexTransformShape" inherit="bhkTransformShape">
         A convex transformed shape?
     </niobject>
 
@@ -2484,7 +2484,7 @@
         <add name="Unknown" type="Vector3" />
     </niobject>
 
-    <niobject name="bhkMultiSphereShape" abstract="0" inherit="bhkSphereRepShape">
+    <niobject name="bhkMultiSphereShape" inherit="bhkSphereRepShape">
         Unknown.
         <add name="Unknown Float 1" type="float">Unknown.</add>
         <add name="Unknown Float 2" type="float">Unknown.</add>
@@ -2496,7 +2496,7 @@
         A tree-like Havok data structure stored in an assembly-like binary code?
     </niobject>
 
-    <niobject name="bhkMoppBvTreeShape" abstract="0" inherit="bhkBvTreeShape">
+    <niobject name="bhkMoppBvTreeShape" inherit="bhkBvTreeShape">
         Memory optimized partial polytope bounding volume tree shape (not an entity).
         <add name="Shape" type="Ref" template="bhkShape">The shape.</add>
         <add name="Unused" type="uint" arr1="3">Garbage data from memory. Referred to as User Data, Shape Collection, and Code.</add>
@@ -2513,7 +2513,7 @@
         Havok collision object that uses multiple shapes?
     </niobject>
 
-    <niobject name="bhkListShape" abstract="0" inherit="bhkShapeCollection">
+    <niobject name="bhkListShape" inherit="bhkShapeCollection">
         A list of shapes.
 
         Do not put a bhkPackedNiTriStripsShape in the Sub Shapes. Use a
@@ -2538,7 +2538,7 @@
     XXX not completely decoded, also the 4 dummy separator bytes seem
     to be missing from nifs that have this block
     -->
-    <niobject name="bhkMeshShape" abstract="0" inherit="bhkShape">
+    <niobject name="bhkMeshShape" inherit="bhkShape">
         <add name="Unknowns" type="uint" arr1="2" />
         <add name="Radius" type="float" />
         <add name="Unused 2" type="byte" arr1="8" />
@@ -2550,7 +2550,7 @@
         <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data" ver2="10.0.1.0">Refers to a bunch of NiTriStripsData objects that make up this shape.</add>
     </niobject>
 
-    <niobject name="bhkPackedNiTriStripsShape" abstract="0" inherit="bhkShapeCollection">
+    <niobject name="bhkPackedNiTriStripsShape" inherit="bhkShapeCollection">
         A shape constructed from strips data.
         <add name="Num Sub Shapes" type="ushort" ver2="20.0.0.5" />
         <add name="Sub Shapes" type="OblivionSubShape" arr1="Num Sub Shapes" ver2="20.0.0.5" />
@@ -2564,7 +2564,7 @@
         <add name="Data" type="Ref" template="hkPackedNiTriStripsData" />
     </niobject>
 
-    <niobject name="bhkNiTriStripsShape" abstract="0" inherit="bhkShapeCollection">
+    <niobject name="bhkNiTriStripsShape" inherit="bhkShapeCollection">
         A shape constructed from a bunch of strips.
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float" default="0.1" />
@@ -2577,7 +2577,7 @@
         <add name="Data Layers" type="HavokFilter" arr1="Num Data Layers">Havok Layers for each strip data.</add>
     </niobject>
 
-    <niobject name="NiExtraData" abstract="0" inherit="NiObject">
+    <niobject name="NiExtraData" inherit="NiObject">
         A generic extra data object.
         <add name="Name" type="string" ver1="10.0.1.0" cond="!BSExtraData">Name of this object.</add>
         <add name="Next Extra Data" type="Ref" template="NiExtraData" ver2="4.2.2.0">Block number of the next extra data object.</add>
@@ -2591,19 +2591,19 @@
         Abstract base class for interpolators that use NiAnimationKeys (Key, KeyGrp) for interpolation.
     </niobject>
 
-    <niobject name="NiFloatInterpolator" abstract="0" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiFloatInterpolator" inherit="NiKeyBasedInterpolator">
         Uses NiFloatKeys to animate a float value over time.
         <add name="Value" type="float" default="-3.402823466e+38">Pose value if lacking NiFloatData.</add>
         <add name="Data" type="Ref" template="NiFloatData" />
     </niobject>
 
-    <niobject name="NiTransformInterpolator" abstract="0" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiTransformInterpolator" inherit="NiKeyBasedInterpolator">
         An interpolator for transform keyframes.
         <add name="Transform" type="NiQuatTransform" />
         <add name="Data" type="Ref" template="NiTransformData" />
     </niobject>
 
-    <niobject name="NiPoint3Interpolator" abstract="0" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiPoint3Interpolator" inherit="NiKeyBasedInterpolator">
         Uses NiPosKeys to animate an NiPoint3 value over time.
         <add name="Value" type="Vector3" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38">Pose value if lacking NiPosData.</add>
         <add name="Data" type="Ref" template="NiPosData" />
@@ -2619,7 +2619,7 @@
         <option value="6" name="Flip" />
     </bitflags>
 
-    <niobject name="NiPathInterpolator" abstract="0" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiPathInterpolator" inherit="NiKeyBasedInterpolator">
         Used to make an object follow a predefined spline path.
         <add name="Flags" type="PathFlags" default="3" />
         <add name="Bank Dir" type="int" default="1">-1 = Negative, 1 = Positive</add>
@@ -2630,13 +2630,13 @@
         <add name="Percent Data" type="Ref" template="NiFloatData" />
     </niobject>
 
-    <niobject name="NiBoolInterpolator" abstract="0" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiBoolInterpolator" inherit="NiKeyBasedInterpolator">
         Uses NiBoolKeys to animate a bool value over time.
         <add name="Value" type="bool" default="2">Pose value if lacking NiBoolData.</add>
         <add name="Data" type="Ref" template="NiBoolData" />
     </niobject>
 
-    <niobject name="NiBoolTimelineInterpolator" abstract="0" inherit="NiBoolInterpolator">
+    <niobject name="NiBoolTimelineInterpolator" inherit="NiBoolInterpolator">
         Uses NiBoolKeys to animate a bool value over time.
         Unlike NiBoolInterpolator, it ensures that keys have not been missed between two updates.
     </niobject>
@@ -2712,7 +2712,7 @@
         <add name="Controller" type="Ref" template="NiTimeController" ver1="3.0">Controller object index. (The first in a chain)</add>
     </niobject>
 
-    <niobject name="NiCollisionObject" abstract="0" inherit="NiObject">
+    <niobject name="NiCollisionObject" inherit="NiObject">
         This is the most common collision object found in NIF files. It acts as a real object that
         is visible and possibly (if the body allows for it) interactive. The node itself
         is simple, it only has three properties.
@@ -2720,7 +2720,7 @@
         <add name="Target" type="Ptr" template="NiAVObject">Index of the AV object referring to this collision object.</add>
     </niobject>
 
-    <niobject name="NiCollisionData" abstract="0" inherit="NiCollisionObject">
+    <niobject name="NiCollisionData" inherit="NiCollisionObject">
         Collision box.
         <add name="Propagation Mode" type="PropagationMode" />
         <add name="Collision Mode" type="CollisionMode" ver1="10.1.0.0" />
@@ -2752,11 +2752,11 @@
         <add name="Body" type="Ref" template="bhkWorldObject" />
     </niobject>
 
-    <niobject name="bhkCollisionObject" abstract="0" inherit="bhkNiCollisionObject">
+    <niobject name="bhkCollisionObject" inherit="bhkNiCollisionObject">
         Havok related collision object?
     </niobject>
 
-    <niobject name="bhkBlendCollisionObject" abstract="0" inherit="bhkCollisionObject">
+    <niobject name="bhkBlendCollisionObject" inherit="bhkCollisionObject">
         Unknown.
         <add name="Heir Gain" type="float" />
         <add name="Vel Gain" type="float" />
@@ -2764,11 +2764,11 @@
         <add name="Unk Float 2" type="float" vercond="User Version 2 &lt; 9" />
     </niobject>
 
-    <niobject name="bhkPCollisionObject" abstract="0" inherit="bhkNiCollisionObject">
+    <niobject name="bhkPCollisionObject" inherit="bhkNiCollisionObject">
         Unknown.
     </niobject>
 
-    <niobject name="bhkSPCollisionObject" abstract="0" inherit="bhkPCollisionObject">
+    <niobject name="bhkSPCollisionObject" inherit="bhkPCollisionObject">
         Unknown.
     </niobject>
 
@@ -2812,7 +2812,7 @@
         Abstract base class representing all rendering properties. Subclasses are attached to NiAVObjects to control their rendering.
     </niobject>
 
-    <niobject name="NiTransparentProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiTransparentProperty" inherit="NiProperty">
         Unknown
         <add name="Unknown" type="byte" arr1="6">Unknown.</add>
     </niobject>
@@ -2872,13 +2872,13 @@
         <add name="Manager Controlled" type="bool" ver1="10.1.0.104" ver2="10.1.0.108" />
     </niobject>
 
-    <niobject name="NiMultiTargetTransformController" abstract="0" inherit="NiInterpController">
+    <niobject name="NiMultiTargetTransformController" inherit="NiInterpController">
         DEPRECATED (20.6)
         <add name="Num Extra Targets" type="ushort">The number of target pointers that follow.</add>
         <add name="Extra Targets" type="Ptr" template="NiAVObject" arr1="Num Extra Targets">NiNode Targets to be controlled.</add>
     </niobject>
 
-    <niobject name="NiGeomMorpherController" abstract="0" inherit="NiInterpController">
+    <niobject name="NiGeomMorpherController" inherit="NiInterpController">
         DEPRECATED (20.5), replaced by NiMorphMeshModifier.
         Time controller for geometry morphing.
         <add name="Extra Flags" type="Flags" ver1="10.0.1.2">1 = UPDATE NORMALS</add>
@@ -2891,11 +2891,11 @@
         <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" ver1="10.2.0.0" ver2="20.0.0.5" vercond="(User Version 2 &gt; 9)">Unknown.</add>
     </niobject>
 
-    <niobject name="NiMorphController" abstract="0" inherit="NiInterpController">
+    <niobject name="NiMorphController" inherit="NiInterpController">
         Unknown! Used by Daoc->'healing.nif'.
     </niobject>
 
-    <niobject name="NiMorpherController" abstract="0" inherit="NiInterpController">
+    <niobject name="NiMorpherController" inherit="NiInterpController">
         Unknown! Used by Daoc.
         <add name="Data" type="Ref" template="NiMorphData">This controller's data.</add>
     </niobject>
@@ -2905,13 +2905,13 @@
         <add name="Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.104" />
     </niobject>
 
-    <niobject name="NiKeyframeController" abstract="0" inherit="NiSingleInterpController">
+    <niobject name="NiKeyframeController" inherit="NiSingleInterpController">
         DEPRECATED (10.2), RENAMED (10.2) to NiTransformController
         A time controller object for animation key frames.
         <add name="Data" type="Ref" template="NiKeyframeData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiTransformController" abstract="0" inherit="NiKeyframeController">
+    <niobject name="NiTransformController" inherit="NiKeyframeController">
         NiTransformController replaces NiKeyframeController.
     </niobject>
 
@@ -2923,7 +2923,7 @@
         <add name="Modifier Name" type="string">Used to find the modifier pointer.</add>
     </niobject>
 
-    <niobject name="NiPSysEmitterCtlr" abstract="0" inherit="NiPSysModifierCtlr">
+    <niobject name="NiPSysEmitterCtlr" inherit="NiPSysModifierCtlr">
         Particle system emitter controller.
         NiInterpController::GetInterpolatorID() string format:
             ['BirthRate', 'EmitterActive'] (for "Interpolator" and "Visibility Interpolator" respectively)
@@ -2935,7 +2935,7 @@
         A particle system modifier controller that animates a boolean value for particles.
     </niobject>
 
-    <niobject name="NiPSysModifierActiveCtlr" abstract="0" inherit="NiPSysModifierBoolCtlr">
+    <niobject name="NiPSysModifierActiveCtlr" inherit="NiPSysModifierBoolCtlr">
         A particle system modifier controller that animates active/inactive state for particles.
         <add name="Data" type="Ref" template="NiVisData" ver2="10.1.0.103" />
     </niobject>
@@ -2945,27 +2945,27 @@
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiPSysEmitterDeclinationCtlr" abstract="0" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterDeclinationCtlr" inherit="NiPSysModifierFloatCtlr">
         Animates the declination value on an NiPSysEmitter object.
     </niobject>
 
-    <niobject name="NiPSysEmitterDeclinationVarCtlr" abstract="0" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterDeclinationVarCtlr" inherit="NiPSysModifierFloatCtlr">
         Animates the declination variation value on an NiPSysEmitter object.
     </niobject>
 
-    <niobject name="NiPSysEmitterInitialRadiusCtlr" abstract="0" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterInitialRadiusCtlr" inherit="NiPSysModifierFloatCtlr">
         Animates the size value on an NiPSysEmitter object.
     </niobject>
 
-    <niobject name="NiPSysEmitterLifeSpanCtlr" abstract="0" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterLifeSpanCtlr" inherit="NiPSysModifierFloatCtlr">
         Animates the lifespan value on an NiPSysEmitter object.
     </niobject>
 
-    <niobject name="NiPSysEmitterSpeedCtlr" abstract="0" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterSpeedCtlr" inherit="NiPSysModifierFloatCtlr">
         Animates the speed value on an NiPSysEmitter object.
     </niobject>
 
-    <niobject name="NiPSysGravityStrengthCtlr" abstract="0" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysGravityStrengthCtlr" inherit="NiPSysModifierFloatCtlr">
         Animates the strength value of an NiPSysGravityModifier.
     </niobject>
 
@@ -2974,7 +2974,7 @@
         Abstract base class for all NiInterpControllers that use an NiInterpolator to animate their target float value.
     </niobject>
 
-    <niobject name="NiFlipController" abstract="0" inherit="NiFloatInterpController">
+    <niobject name="NiFlipController" inherit="NiFloatInterpController">
         Changes the image a Map (TexDesc) will use. Uses a float interpolator to animate the texture index.
         Often used for performing flipbook animation.
         <add name="Texture Slot" type="TexType">Target texture slot (0=base, 4=glow).</add>
@@ -2988,12 +2988,12 @@
         <add name="Images" type="Ref" template="NiImage" arr1="Num Sources" ver2="3.1">The image sources</add>
     </niobject>
 
-    <niobject name="NiAlphaController" abstract="0" inherit="NiFloatInterpController">
+    <niobject name="NiAlphaController" inherit="NiFloatInterpController">
         Animates the alpha value of a property using an interpolator.
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiTextureTransformController" abstract="0" inherit="NiFloatInterpController">
+    <niobject name="NiTextureTransformController" inherit="NiFloatInterpController">
         Used to animate a single member of an NiTextureTransform.
         NiInterpController::GetCtlrID() string formats:
             ['%1-%2-TT_TRANSLATE_U', '%1-%2-TT_TRANSLATE_V', '%1-%2-TT_ROTATE', '%1-%2-TT_SCALE_U', '%1-%2-TT_SCALE_V']
@@ -3004,7 +3004,7 @@
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiLightDimmerController" abstract="0" inherit="NiFloatInterpController">
+    <niobject name="NiLightDimmerController" inherit="NiFloatInterpController">
         Unknown controller.
     </niobject>
 
@@ -3012,7 +3012,7 @@
         Abstract base class for all NiInterpControllers that use a NiInterpolator to animate their target boolean value.
     </niobject>
 
-    <niobject name="NiVisController" abstract="0" inherit="NiBoolInterpController">
+    <niobject name="NiVisController" inherit="NiBoolInterpController">
         Animates the visibility of an NiAVObject.
         <add name="Data" type="Ref" template="NiVisData" ver2="10.1.0.103" />
     </niobject>
@@ -3021,7 +3021,7 @@
         Abstract base class for all NiInterpControllers that use an NiInterpolator to animate their target NiPoint3 value.
     </niobject>
 
-    <niobject name="NiMaterialColorController" abstract="0" inherit="NiPoint3InterpController">
+    <niobject name="NiMaterialColorController" inherit="NiPoint3InterpController">
         Time controller for material color. Flags are used for color selection in versions below 10.1.0.0.
         Bits 4-5: Target Color (00 = Ambient, 01 = Diffuse, 10 = Specular, 11 = Emissive)
         NiInterpController::GetCtlrID() string formats:
@@ -3030,7 +3030,7 @@
         <add name="Data" type="Ref" template="NiPosData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiLightColorController" abstract="0" inherit="NiPoint3InterpController">
+    <niobject name="NiLightColorController" inherit="NiPoint3InterpController">
         Animates the ambient, diffuse and specular colors of an NiLight.
         NiInterpController::GetCtlrID() string formats:
             ['Diffuse', 'Ambient'] (Depending on "Target Color")
@@ -3047,7 +3047,7 @@
         <add name="Extra Data Name" type="string" ver1="10.2.0.0" />
     </niobject>
 
-    <niobject name="NiFloatExtraDataController" abstract="0" inherit="NiExtraDataController">
+    <niobject name="NiFloatExtraDataController" inherit="NiExtraDataController">
         Animates an NiFloatExtraData object attached to an NiAVObject.
         NiInterpController::GetCtlrID() string format is same as parent.
         <add name="Num Extra Bytes" type="byte" ver2="10.1.0.0">Number of extra bytes.</add>
@@ -3056,7 +3056,7 @@
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiFloatsExtraDataController" abstract="0" inherit="NiExtraDataController">
+    <niobject name="NiFloatsExtraDataController" inherit="NiExtraDataController">
         Animates an NiFloatsExtraData object attached to an NiAVObject.
         NiInterpController::GetCtlrID() string format:
             '%s[%d]'
@@ -3065,7 +3065,7 @@
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiFloatsExtraDataPoint3Controller" abstract="0" inherit="NiExtraDataController">
+    <niobject name="NiFloatsExtraDataPoint3Controller" inherit="NiExtraDataController">
         Animates an NiFloatsExtraData object attached to an NiAVObject.
         NiInterpController::GetCtlrID() string format:
             '%s[%d]'
@@ -3073,7 +3073,7 @@
         <add name="Floats Extra Data Index" type="int" />
     </niobject>
 
-    <niobject name="NiBoneLODController" abstract="0" inherit="NiTimeController">
+    <niobject name="NiBoneLODController" inherit="NiTimeController">
         DEPRECATED (20.5), Replaced by NiSkinningLODController.
         Level of detail controller for bones.  Priority is arranged from low to high.
         <add name="LOD" type="uint">Unknown.</add>
@@ -3092,7 +3092,7 @@
         <add name="Unknown Int 3" type="int" ver1="20.3.0.9" ver2="20.3.0.9" userver="131072">Unknown.</add>
     </niobject>
 
-    <niobject name="NiBSBoneLODController" abstract="0" inherit="NiBoneLODController">
+    <niobject name="NiBSBoneLODController" inherit="NiBoneLODController">
         A simple LOD controller for bones.
     </niobject>
     
@@ -3227,38 +3227,38 @@
         <add name="Num Triangles" type="ushort">Number of triangles.</add>
     </niobject>
 
-    <niobject name="bhkBlendController" abstract="0" inherit="NiTimeController">
+    <niobject name="bhkBlendController" inherit="NiTimeController">
         Unknown. Is apparently only used in skeleton.nif files.
         <add name="Keys" type="uint">Seems to be always zero.</add>
     </niobject>
 
-    <niobject name="BSBound" abstract="0" inherit="NiExtraData">
+    <niobject name="BSBound" inherit="NiExtraData">
         Bethesda-specific collision bounding box for skeletons.
         <add name="Center" type="Vector3">Center of the bounding box.</add>
         <add name="Dimensions" type="Vector3">Dimensions of the bounding box from center.</add>
     </niobject>
 
-    <niobject name="BSFurnitureMarker" abstract="0" inherit="NiExtraData">
+    <niobject name="BSFurnitureMarker" inherit="NiExtraData">
         Unknown. Marks furniture sitting positions?
         <add name="Num Positions" type="uint">Number of positions.</add>
         <add name="Positions" type="FurniturePosition" arr1="Num Positions">Unknown. Probably has something to do with the furniture positions?</add>
     </niobject>
 
-    <niobject name="BSParentVelocityModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="BSParentVelocityModifier" inherit="NiPSysModifier">
         Particle modifier that adds a blend of object space translation and rotation to particles born in world space.
         <add name="Damping" type="float">Amount of blending?</add>
     </niobject>
 
-    <niobject name="BSPSysArrayEmitter" abstract="0" inherit="NiPSysVolumeEmitter">
+    <niobject name="BSPSysArrayEmitter" inherit="NiPSysVolumeEmitter">
         Particle emitter that uses a node, its children and subchildren to emit from.  Emission will be evenly spread along points from nodes leading to their direct parents/children only.
     </niobject>
 
-    <niobject name="BSWindModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="BSWindModifier" inherit="NiPSysModifier">
         Particle Modifier that uses the wind value from the gamedata to alter the path of particles.
         <add name="Strength" type="float">The amount of force wind will have on particles.</add>
     </niobject>
 
-    <niobject name="hkPackedNiTriStripsData" abstract="0" inherit="bhkShapeCollection">
+    <niobject name="hkPackedNiTriStripsData" inherit="bhkShapeCollection">
         NiTriStripsData for havok data?
         <add name="Num Triangles" type="uint" />
         <add name="Triangles" type="TriangleData" arr1="Num Triangles" />
@@ -3269,7 +3269,7 @@
         <add name="Sub Shapes" type="OblivionSubShape" arr1="Num Sub Shapes" ver1="20.2.0.7">The subparts.</add>
     </niobject>
 
-    <niobject name="NiAlphaProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiAlphaProperty" inherit="NiProperty">
         Transparency. Flags 0x00ED.
         <add name="Flags" type="Flags" default="4844">
             Bit 0 : alpha blending enable
@@ -3307,11 +3307,11 @@
         <add name="Unknown Int 2" type="uint" ver2="2.3">Unknown</add>
     </niobject>
 
-    <niobject name="NiAmbientLight" abstract="0" inherit="NiLight">
+    <niobject name="NiAmbientLight" inherit="NiLight">
         Ambient light source.
     </niobject>
 
-    <niobject name="NiParticlesData" abstract="0" inherit="NiGeometryData">
+    <niobject name="NiParticlesData" inherit="NiGeometryData">
         Generic rotating particles data object.
         <!-- Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly. 
             `!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))` means "Not Bethesda 20.2"
@@ -3341,13 +3341,13 @@
         <add name="Speed to Aspect Speed 2" type="float" vercond="(User Version 2 &gt; 34)" />
     </niobject>
 
-    <niobject name="NiRotatingParticlesData" abstract="0" inherit="NiParticlesData">
+    <niobject name="NiRotatingParticlesData" inherit="NiParticlesData">
         Rotating particles data object.
         <add name="Has Rotations 2" type="bool" ver2="4.2.2.0">Is the particle rotation array present?</add>
         <add name="Rotations 2" type="Quaternion" arr1="Num Vertices" cond="Has Rotations 2" ver2="4.2.2.0">The individual particle rotations.</add>
     </niobject>
 
-    <niobject name="NiAutoNormalParticlesData" abstract="0" inherit="NiParticlesData">
+    <niobject name="NiAutoNormalParticlesData" inherit="NiParticlesData">
         Particle system data object (with automatic normals?).
     </niobject>
 
@@ -3361,7 +3361,7 @@
         <add name="Unknown Int 1" type="int">Unknown.</add>
     </compound>
 
-    <niobject name="NiPSysData" abstract="0" inherit="NiParticlesData">
+    <niobject name="NiPSysData" inherit="NiParticlesData">
         Particle system data.
         <!-- `!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))` means "Not Bethesda 20.2" -->
         <add name="Particle Descriptions" type="ParticleDesc" arr1="Num Vertices" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
@@ -3371,7 +3371,7 @@
         <add name="Added Particles Base" type="ushort" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
     </niobject>
     
-    <niobject name="NiMeshPSysData" abstract="0" inherit="NiPSysData">
+    <niobject name="NiMeshPSysData" inherit="NiPSysData">
         Particle meshes data.
         <add name="Default Pool Size" type="uint" ver1="10.2.0.0" />
         <add name="Fill Pools On Load" type="bool" ver1="10.2.0.0" />
@@ -3380,18 +3380,18 @@
         <add name="Particle Meshes" type="Ref" template="NiNode" />
     </niobject>
 
-    <niobject name="NiBinaryExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiBinaryExtraData" inherit="NiExtraData">
         Binary extra data object. Used to store tangents and bitangents in Oblivion.
         <add name="Binary Data" type="ByteArray">The binary data.</add>
     </niobject>
 
-    <niobject name="NiBinaryVoxelExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiBinaryVoxelExtraData" inherit="NiExtraData">
         Voxel extra data object.
         <add name="Unknown Int" type="uint" default="0">Unknown.  0?</add>
         <add name="Data" type="Ref" template="NiBinaryVoxelData">Link to binary voxel data.</add>
     </niobject>
 
-    <niobject name="NiBinaryVoxelData" abstract="0" inherit="NiObject">
+    <niobject name="NiBinaryVoxelData" inherit="NiObject">
         Voxel data object.
         <add name="Unknown Short 1" type="ushort">Unknown.</add>
         <add name="Unknown Short 2" type="ushort">Unknown.</add>
@@ -3405,37 +3405,37 @@
         <add name="Unknown 5 Ints" type="uint" arr1="5">Unknown.</add>
     </niobject>
 
-    <niobject name="NiBlendBoolInterpolator" abstract="0" inherit="NiBlendInterpolator">
+    <niobject name="NiBlendBoolInterpolator" inherit="NiBlendInterpolator">
         Blends bool values together.
         <add name="Value" type="byte" default="2">The pose value. Invalid if using data.</add>
     </niobject>
 
-    <niobject name="NiBlendFloatInterpolator" abstract="0" inherit="NiBlendInterpolator">
+    <niobject name="NiBlendFloatInterpolator" inherit="NiBlendInterpolator">
         Blends float values together.
         <add name="Value" type="float" default="-3.402823466e+38">The pose value. Invalid if using data.</add>
     </niobject>
 
-    <niobject name="NiBlendPoint3Interpolator" abstract="0" inherit="NiBlendInterpolator">
+    <niobject name="NiBlendPoint3Interpolator" inherit="NiBlendInterpolator">
         Blends NiPoint3 values together.
         <add name="Value" type="Vector3" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38">The pose value. Invalid if using data.</add>
     </niobject>
 
-    <niobject name="NiBlendTransformInterpolator" abstract="0" inherit="NiBlendInterpolator">
+    <niobject name="NiBlendTransformInterpolator" inherit="NiBlendInterpolator">
         Blends NiQuatTransform values together.
         <add name="Value" type="NiQuatTransform" ver2="10.1.0.109" />
     </niobject>
 
-    <niobject name="NiBoolData" abstract="0" inherit="NiObject">
+    <niobject name="NiBoolData" inherit="NiObject">
         Wrapper for boolean animation keys.
         <add name="Data" type="KeyGroup" template="byte">The boolean keys.</add>
     </niobject>
 
-    <niobject name="NiBooleanExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiBooleanExtraData" inherit="NiExtraData">
         Boolean extra data.
         <add name="Boolean Data" type="byte">The boolean extra data value.</add>
     </niobject>
 
-    <niobject name="NiBSplineBasisData" abstract="0" inherit="NiObject">
+    <niobject name="NiBSplineBasisData" inherit="NiObject">
         Contains an NiBSplineBasis for use in interpolation of open, uniform B-Splines.
         <add name="Num Control Points" type="uint">The number of control points of the B-spline (number of frames of animation plus degree of B-spline minus one).</add>
     </niobject>
@@ -3446,7 +3446,7 @@
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompFloatInterpolator" abstract="0" inherit="NiBSplineFloatInterpolator">
+    <niobject name="NiBSplineCompFloatInterpolator" inherit="NiBSplineFloatInterpolator">
         NiBSplineFloatInterpolator plus the information required for using compact control points.
         <add name="Float Offset" type="float" default="3.402823466e+38" />
         <add name="Float Half Range" type="float" default="3.402823466e+38" />
@@ -3458,13 +3458,13 @@
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompPoint3Interpolator" abstract="0" inherit="NiBSplinePoint3Interpolator">
+    <niobject name="NiBSplineCompPoint3Interpolator" inherit="NiBSplinePoint3Interpolator">
         NiBSplinePoint3Interpolator plus the information required for using compact control points.
         <add name="Position Offset" type="float" default="3.402823466e+38" />
         <add name="Position Half Range" type="float" default="3.402823466e+38" />
     </niobject>
 
-    <niobject name="NiBSplineTransformInterpolator" abstract="0" inherit="NiBSplineInterpolator">
+    <niobject name="NiBSplineTransformInterpolator" inherit="NiBSplineInterpolator">
         Supports the animation of position, rotation, and scale using an NiQuatTransform.
         The NiQuatTransform can be an unchanging pose or interpolated from B-Spline control point channels.
         <add name="Transform" type="NiQuatTransform" />
@@ -3473,7 +3473,7 @@
         <add name="Scale Handle" type="uint" default="0xFFFF">Handle into the scale data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompTransformInterpolator" abstract="0" inherit="NiBSplineTransformInterpolator">
+    <niobject name="NiBSplineCompTransformInterpolator" inherit="NiBSplineTransformInterpolator">
         NiBSplineTransformInterpolator plus the information required for using compact control points.
         <add name="Translation Offset" type="float" default="3.402823466e+38" />
         <add name="Translation Half Range" type="float" default="3.402823466e+38" />
@@ -3486,7 +3486,7 @@
 	<niobject name="BSRotAccumTransfInterpolator" inherit="NiTransformInterpolator">
 	</niobject>
 
-    <niobject name="NiBSplineData" abstract="0" inherit="NiObject">
+    <niobject name="NiBSplineData" inherit="NiObject">
         Contains one or more sets of control points for use in interpolation of open, uniform B-Splines, stored as either float or compact.
         <add name="Num Float Control Points" type="uint" />
         <add name="Float Control Points" type="float" arr1="Num Float Control Points">Float values representing the control data.</add>
@@ -3494,7 +3494,7 @@
         <add name="Compact Control Points" type="short" arr1="Num Compact Control Points">Signed shorts representing the data from 0 to 1 (scaled by SHRT_MAX).</add>
     </niobject>
 
-    <niobject name="NiCamera" abstract="0" inherit="NiAVObject">
+    <niobject name="NiCamera" inherit="NiAVObject">
         Camera object.
         <add name="Camera Flags" type="ushort" ver1="10.1.0.0">Obsolete flags.</add>
         <add name="Frustum Left" type="float">Frustrum left.</add>
@@ -3515,17 +3515,17 @@
         <add name="Unknown Int 3" type="uint" ver2="3.1">Unknown.</add>
     </niobject>
 
-    <niobject name="NiColorData" abstract="0" inherit="NiObject">
+    <niobject name="NiColorData" inherit="NiObject">
         Wrapper for color animation keys.
         <add name="Data" type="KeyGroup" template="Color4">The color keys.</add>
     </niobject>
 
-    <niobject name="NiColorExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiColorExtraData" inherit="NiExtraData">
         Extra data in the form of NiColorA (red, green, blue, alpha).
         <add name="Data" type="Color4">RGBA Color?</add>
     </niobject>
 
-    <niobject name="NiControllerManager" abstract="0" inherit="NiTimeController">
+    <niobject name="NiControllerManager" inherit="NiTimeController">
         Controls animation sequences on a specific branch of the scene graph.
         <add name="Cumulative" type="bool">Whether transformation accumulation is enabled. If accumulation is not enabled, the manager will treat all sequence data on the accumulation root as absolute data instead of relative delta values.</add>
         <add name="Num Controller Sequences" type="uint" />
@@ -3533,7 +3533,7 @@
         <add name="Object Palette" type="Ref" template="NiDefaultAVObjectPalette" />
     </niobject>
 
-    <niobject name="NiSequence" abstract="0" inherit="NiObject">
+    <niobject name="NiSequence" inherit="NiObject">
         Root node in NetImmerse .kf files (until version 10.0).
         <add name="Name" type="string">The sequence name by which the animation system finds and manages this sequence.</add>
         <add name="Accum Root Name" type="string" ver2="10.1.0.103">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
@@ -3545,7 +3545,7 @@
         <add name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" />
     </niobject>
 
-    <niobject name="NiControllerSequence" abstract="0" inherit="NiSequence">
+    <niobject name="NiControllerSequence" inherit="NiSequence">
         Root node in Gamebryo .kf files (version 10.0.1.0 and up).
         <add name="Weight" type="float" default="1.0" ver1="10.1.0.106">The weight of a sequence describes how it blends with other sequences at the same priority.</add>
         <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver1="10.1.0.106" />
@@ -3569,44 +3569,44 @@
         Abstract base class for indexing NiAVObject by name.
     </niobject>
 
-    <niobject name="NiDefaultAVObjectPalette" abstract="0" inherit="NiAVObjectPalette">
+    <niobject name="NiDefaultAVObjectPalette" inherit="NiAVObjectPalette">
         NiAVObjectPalette implementation. Used to quickly look up objects by name.
         <add name="Scene" type="Ptr" template="NiAVObject">Scene root of the object palette.</add>
         <add name="Num Objs" type="uint">Number of objects.</add>
         <add name="Objs" type="AVObject" arr1="Num Objs">The objects.</add>
     </niobject>
 
-    <niobject name="NiDirectionalLight" abstract="0" inherit="NiLight">
+    <niobject name="NiDirectionalLight" inherit="NiLight">
         Directional light source.
     </niobject>
 
-    <niobject name="NiDitherProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiDitherProperty" inherit="NiProperty">
         NiDitherProperty allows the application to turn the dithering of interpolated colors and fog values on and off.
         <add name="Flags" type="Flags">1 = Enable dithering</add>
     </niobject>
 
-    <niobject name="NiRollController" abstract="0" inherit="NiSingleInterpController">
+    <niobject name="NiRollController" inherit="NiSingleInterpController">
         DEPRECATED (10.2), REMOVED (20.5). Replaced by NiTransformController and NiLookAtInterpolator.
         <add name="Data" type="Ref" template="NiFloatData">The data for the controller.</add>
     </niobject>
 
-    <niobject name="NiFloatData" abstract="0" inherit="NiObject">
+    <niobject name="NiFloatData" inherit="NiObject">
         Wrapper for 1D (one-dimensional) floating point animation keys.
         <add name="Data" type="KeyGroup" template="float">The keys.</add>
     </niobject>
 
-    <niobject name="NiFloatExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiFloatExtraData" inherit="NiExtraData">
         Extra float data.
         <add name="Float Data" type="float">The float data.</add>
     </niobject>
 
-    <niobject name="NiFloatsExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiFloatsExtraData" inherit="NiExtraData">
         Extra float array data.
         <add name="Num Floats" type="uint">Number of floats in the next field.</add>
         <add name="Data" type="float" arr1="Num Floats">Float data.</add>
     </niobject>
 
-    <niobject name="NiFogProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiFogProperty" inherit="NiProperty">
         NiFogProperty allows the application to enable, disable and control the appearance of fog.
         <add name="Flags" type="Flags">
             Bit 0: Enables Fog
@@ -3619,7 +3619,7 @@
         <add name="Fog Color" type="Color3">The color of the fog.</add>
     </niobject>
 
-    <niobject name="NiGravity" abstract="0" inherit="NiParticleModifier">
+    <niobject name="NiGravity" inherit="NiParticleModifier">
         LEGACY (pre-10.1) particle modifier. Applies a gravitational field on the particles.
         <add name="Unknown Float 1" type="float" ver1="3.3.0.13">Unknown.</add>
         <add name="Force" type="float">The strength/force of this gravity.</add>
@@ -3628,12 +3628,12 @@
         <add name="Direction" type="Vector3">The direction of the applied acceleration.</add>
     </niobject>
 
-    <niobject name="NiIntegerExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiIntegerExtraData" inherit="NiExtraData">
         Extra integer data.
         <add name="Integer Data" type="uint">The value of the extra data.</add>
     </niobject>
 
-    <niobject name="BSXFlags" abstract="0" inherit="NiIntegerExtraData">
+    <niobject name="BSXFlags" inherit="NiIntegerExtraData">
         Controls animation and collision.  Integer holds flags:
         Bit 0 : enable havok, bAnimated(Skyrim)
         Bit 1 : enable collision, bHavok(Skyrim)
@@ -3651,18 +3651,18 @@
         Bit 13: bSearchedBreakable(Skyrim) .. Runtime only?
     </niobject>
 
-    <niobject name="NiIntegersExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiIntegersExtraData" inherit="NiExtraData">
         Extra integer array data.
         <add name="Num Integers" type="uint">Number of integers.</add>
         <add name="Data" type="uint" arr1="Num Integers">Integers.</add>
     </niobject>
 
-    <niobject name="BSKeyframeController" abstract="0" inherit="NiKeyframeController">
+    <niobject name="BSKeyframeController" inherit="NiKeyframeController">
         An extended keyframe controller.
         <add name="Data 2" type="Ref" template="NiKeyframeData">A link to more keyframe data.</add>
     </niobject>
 
-    <niobject name="NiKeyframeData" abstract="0" inherit="NiObject">
+    <niobject name="NiKeyframeData" inherit="NiObject">
         DEPRECATED (10.2), RENAMED (10.2) to NiTransformData.
         Wrapper for transformation animation keys.
         <add name="Num Rotation Keys" type="uint">The number of quaternion rotation keys. If the rotation type is XYZ (type 4) then this *must* be set to 1, and in this case the actual number of keys is stored in the XYZ Rotations field.</add>
@@ -3680,14 +3680,14 @@
         <option value="2" name="LOOK_Z_AXIS">Z-Axis</option>
     </bitflags>
 
-    <niobject name="NiLookAtController" abstract="0" inherit="NiTimeController">
+    <niobject name="NiLookAtController" inherit="NiTimeController">
         DEPRECATED (10.2), REMOVED (20.5)
         Replaced by NiTransformController and NiLookAtInterpolator.
         <add name="Flags" type="LookAtFlags" ver1="10.1.0.0" />
         <add name="Look At" type="Ptr" template="NiNode" />
     </niobject>
 
-    <niobject name="NiLookAtInterpolator" abstract="0" inherit="NiInterpolator">
+    <niobject name="NiLookAtInterpolator" inherit="NiInterpolator">
         NiLookAtInterpolator rotates an object so that it always faces a target object.
         <add name="Flags" type="LookAtFlags" />
         <add name="Look At" type="Ptr" template="NiNode" />
@@ -3698,7 +3698,7 @@
         <add name="Interpolator: Scale" type="Ref" template="NiFloatInterpolator" />
     </niobject>
 
-    <niobject name="NiMaterialProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiMaterialProperty" inherit="NiProperty">
         Describes the surface properties of an object e.g. translucency, ambient color, diffuse color, emissive color, and specular color.
         <add name="Flags" type="Flags" ver1="3.0" ver2="10.0.1.2">Property flags.</add>
         <add name="Ambient Color" type="Color3" default="1.0, 1.0, 1.0" vercond="(User Version 2 &lt; 26)">How much the material reflects ambient light.</add>
@@ -3710,7 +3710,7 @@
         <add name="Emissive Mult" type="float" default="1.0" vercond="(User Version 2 &gt; 21)" />
     </niobject>
 
-    <niobject name="NiMorphData" abstract="0" inherit="NiObject">
+    <niobject name="NiMorphData" inherit="NiObject">
         DEPRECATED (20.5), replaced by NiMorphMeshModifier.
         Geometry morphing data.
         <add name="Num Morphs" type="uint">Number of morphing object.</add>
@@ -3719,7 +3719,7 @@
         <add name="Morphs" type="Morph" arg="Num Vertices" arr1="Num Morphs">The geometry morphing objects.</add>
     </niobject>
 
-    <niobject name="NiNode" abstract="0" inherit="NiAVObject">
+    <niobject name="NiNode" inherit="NiAVObject">
         Generic node object for grouping.
         <add name="Num Children" type="uint">The number of child objects.</add>
         <add name="Children" type="Ref" template="NiAVObject" arr1="Num Children">List of child node object indices.</add>
@@ -3727,25 +3727,25 @@
         <add name="Effects" type="Ref" template="NiDynamicEffect" arr1="Num Effects" vercond="User Version 2 &lt; 130">List of node effects. ADynamicEffect?</add>
     </niobject>
 
-    <niobject name="NiBone" abstract="0" inherit="NiNode">
+    <niobject name="NiBone" inherit="NiNode">
         A NiNode used as a skeleton bone?
     </niobject>
 
-    <niobject name="AvoidNode" abstract="0" inherit="NiNode">
+    <niobject name="AvoidNode" inherit="NiNode">
         Morrowind specific.
     </niobject>
 
-    <niobject name="FxWidget" abstract="0" inherit="NiNode">
+    <niobject name="FxWidget" inherit="NiNode">
         Firaxis-specific UI widgets?
         <add name="Unknown 3" type="byte">Unknown.</add>
         <add name="Unknown 292 Bytes" type="byte" arr1="292">Looks like 9 links and some string data.</add>
     </niobject>
 
-    <niobject name="FxButton" abstract="0" inherit="FxWidget">
+    <niobject name="FxButton" inherit="FxWidget">
         Unknown.
     </niobject>
 
-    <niobject name="FxRadioButton" abstract="0" inherit="FxWidget">
+    <niobject name="FxRadioButton" inherit="FxWidget">
         Unknown.
         <add name="Unknown Int 1" type="uint">Unknown.</add>
         <add name="Unknown Int  2" type="uint">Unknown.</add>
@@ -3754,7 +3754,7 @@
         <add name="Buttons" type="Ptr" template="FxRadioButton" arr1="Num Buttons">Unknown pointers to other buttons.  Maybe other buttons in a group so they can be switch off if this one is switched on?</add>
     </niobject>
 
-    <niobject name="NiBillboardNode" abstract="0" inherit="NiNode">
+    <niobject name="NiBillboardNode" inherit="NiNode">
         These nodes will always be rotated to face the camera creating a billboard effect for any attached objects.
 
         In pre-10.1.0.0 the Flags field is used for BillboardMode.
@@ -3777,11 +3777,11 @@
         <add name="Billboard Mode" type="BillboardMode" ver1="10.1.0.0">The way the billboard will react to the camera.</add>
     </niobject>
 
-    <niobject name="NiBSAnimationNode" abstract="0" inherit="NiNode">
+    <niobject name="NiBSAnimationNode" inherit="NiNode">
         Bethesda-specific extension of Node with animation properties stored in the flags, often 42?
     </niobject>
 
-    <niobject name="NiBSParticleNode" abstract="0" inherit="NiNode">
+    <niobject name="NiBSParticleNode" inherit="NiNode">
         Unknown.
     </niobject>
     
@@ -3791,13 +3791,13 @@
         <option value="1" name="UpdateControllers">Update Controllers</option>
     </bitflags>
 
-    <niobject name="NiSwitchNode" abstract="0" inherit="NiNode">
+    <niobject name="NiSwitchNode" inherit="NiNode">
         Represents groups of multiple scenegraph subtrees, only one of which (the "active child") is drawn at any given time.
         <add name="Switch Node Flags" type="NiSwitchFlags" ver1="10.1.0.0" />
         <add name="Index" type="uint" />
     </niobject>
 
-    <niobject name="NiLODNode" abstract="0" inherit="NiSwitchNode">
+    <niobject name="NiLODNode" inherit="NiSwitchNode">
         Level of detail selector. Links to different levels of detail of the same model, used to switch a geometry at a specified distance.
         <add name="LOD Center" type="Vector3" ver1="4.0.0.2" ver2="10.0.1.0" />
         <add name="Num LOD Levels" type="uint" ver2="10.0.1.0" />
@@ -3805,7 +3805,7 @@
         <add name="LOD Level Data" type="Ref" template="NiLODData" ver1="10.1.0.0" />
     </niobject>
 
-    <niobject name="NiPalette" abstract="0" inherit="NiObject">
+    <niobject name="NiPalette" inherit="NiObject">
         NiPalette objects represent mappings from 8-bit indices to 24-bit RGB or 32-bit RGBA colors.
         <add name="Has Alpha" type="byte" /> <!-- Not bool as always 8-bit -->
         <add name="Num Entries" type="uint" default="256">The number of palette entries. Always 256 but can also be 16.</add>
@@ -3813,7 +3813,7 @@
         <add name="Palette" type="ByteColor4" arr1="256" cond="Num Entries != 16">The color palette.</add>
     </niobject>
 
-    <niobject name="NiParticleBomb" abstract="0" inherit="NiParticleModifier">
+    <niobject name="NiParticleBomb" inherit="NiParticleModifier">
         LEGACY (pre-10.1) particle modifier.
         <add name="Decay" type="float" />
         <add name="Duration" type="float" />
@@ -3825,49 +3825,49 @@
         <add name="Direction" type="Vector3">The direction of the applied acceleration?</add>
     </niobject>
 
-    <niobject name="NiParticleColorModifier" abstract="0" inherit="NiParticleModifier">
+    <niobject name="NiParticleColorModifier" inherit="NiParticleModifier">
         LEGACY (pre-10.1) particle modifier.
         <add name="Color Data" type="Ref" template="NiColorData" />
     </niobject>
 
-    <niobject name="NiParticleGrowFade" abstract="0" inherit="NiParticleModifier">
+    <niobject name="NiParticleGrowFade" inherit="NiParticleModifier">
         LEGACY (pre-10.1) particle modifier.
         <add name="Grow" type="float">The time from the beginning of the particle lifetime during which the particle grows.</add>
         <add name="Fade" type="float">The time from the end of the particle lifetime during which the particle fades.</add>
     </niobject>
 
-    <niobject name="NiParticleMeshModifier" abstract="0" inherit="NiParticleModifier">
+    <niobject name="NiParticleMeshModifier" inherit="NiParticleModifier">
         LEGACY (pre-10.1) particle modifier.
         <add name="Num Particle Meshes" type="uint" />
         <add name="Particle Meshes" arr1="Num Particle Meshes" type="Ref" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiParticleRotation" abstract="0" inherit="NiParticleModifier">
+    <niobject name="NiParticleRotation" inherit="NiParticleModifier">
         LEGACY (pre-10.1) particle modifier.
         <add name="Random Initial Axis" type="byte" />
         <add name="Initial Axis" type="Vector3" />
         <add name="Rotation Speed" type="float" />
     </niobject>
 
-    <niobject name="NiParticles" abstract="0" inherit="NiGeometry">
+    <niobject name="NiParticles" inherit="NiGeometry">
         Generic particle system node.
         <add name="Vertex Desc" type="BSVertexDesc" vercond="(User Version 2 &gt;= 100)" />
     </niobject>
 
-    <niobject name="NiAutoNormalParticles" abstract="0" inherit="NiParticles">
+    <niobject name="NiAutoNormalParticles" inherit="NiParticles">
         LEGACY (pre-10.1). NiParticles which do not house normals and generate them at runtime.
     </niobject>
 
-    <niobject name="NiParticleMeshes" abstract="0" inherit="NiParticles">
+    <niobject name="NiParticleMeshes" inherit="NiParticles">
         LEGACY (pre-10.1). Particle meshes.
     </niobject>
 
-    <niobject name="NiParticleMeshesData" abstract="0" inherit="NiRotatingParticlesData">
+    <niobject name="NiParticleMeshesData" inherit="NiRotatingParticlesData">
         LEGACY (pre-10.1). Particle meshes data.
         <add name="Unknown Link 2" type="Ref" template="NiAVObject">Refers to the mesh that makes up a particle?</add>
     </niobject>
 
-    <niobject name="NiParticleSystem" abstract="0" inherit="NiParticles">
+    <niobject name="NiParticleSystem" inherit="NiParticles">
         A particle system.
         <!-- Bethesda -->
         <add name="Far Begin" type="ushort" vercond="(User Version 2 &gt;= 83)" />
@@ -3881,11 +3881,11 @@
         <add name="Modifiers" type="Ref" template="NiPSysModifier" arr1="Num Modifiers" ver1="10.1.0.0">The list of particle modifiers.</add>
     </niobject>
 
-    <niobject name="NiMeshParticleSystem" abstract="0" inherit="NiParticleSystem">
+    <niobject name="NiMeshParticleSystem" inherit="NiParticleSystem">
         Particle system.
     </niobject>
 
-    <niobject name="NiParticleSystemController" abstract="0" inherit="NiTimeController">
+    <niobject name="NiParticleSystemController" inherit="NiTimeController">
         A generic particle system time controller object.
         <add name="Old Speed" type="uint" ver2="3.1">Particle speed in old files</add>
         <add name="Speed" type="float" ver1="3.3.0.13">Particle speed</add>
@@ -3938,11 +3938,11 @@
         <add name="Unknown Floats 2" arr1="Particle Unknown Short" type="float" ver2="3.1" />
     </niobject>
 
-    <niobject name="NiBSPArrayController" abstract="0" inherit="NiParticleSystemController">
+    <niobject name="NiBSPArrayController" inherit="NiParticleSystemController">
         A particle system controller, used by BS in conjunction with NiBSParticleNode.
     </niobject>
 
-    <niobject name="NiPathController" abstract="0" inherit="NiTimeController">
+    <niobject name="NiPathController" inherit="NiTimeController">
         DEPRECATED (10.2), REMOVED (20.5). Replaced by NiTransformController and NiPathInterpolator.
         Time controller for a path.
         <add name="Path Flags" type="PathFlags" ver1="10.1.0.0" />
@@ -4002,7 +4002,7 @@
         <add name="Pixel Data" type="byte" binary="1" arr1="Num Pixels * Num Faces" />
     </niobject>
 
-    <niobject name="NiPixelData" abstract="0" inherit="NiPixelFormat">
+    <niobject name="NiPixelData" inherit="NiPixelFormat">
         A texture.
         <add name="Palette" type="Ref" template="NiPalette" />
         <add name="Num Mipmaps" type="uint" />
@@ -4014,7 +4014,7 @@
         <add name="Pixel Data" type="byte" binary="1" arr1="Num Pixels * Num Faces" ver1="10.3.0.6" />
     </niobject>
 
-    <niobject name="NiPlanarCollider" abstract="0" inherit="NiParticleModifier">
+    <niobject name="NiPlanarCollider" inherit="NiParticleModifier">
         LEGACY (pre-10.1) particle modifier.
         <add name="Unknown Short" type="ushort" ver1="10.0.1.0">Usually 0?</add>
         <add name="Unknown Float 1" type="float">Unknown.</add>
@@ -4036,19 +4036,19 @@
         <add name="Unknown Float 16" type="float">Unknown.</add>
     </niobject>
 
-    <niobject name="NiPointLight" abstract="0" inherit="NiLight">
+    <niobject name="NiPointLight" inherit="NiLight">
         A point light.
         <add name="Constant Attenuation" type="float" />
         <add name="Linear Attenuation" type="float" default="1.0" />
         <add name="Quadratic Attenuation" type="float" />
     </niobject>
 
-    <niobject name="NiPosData" abstract="0" inherit="NiObject">
+    <niobject name="NiPosData" inherit="NiObject">
         Wrapper for position animation keys.
         <add name="Data" type="KeyGroup" template="Vector3" />
     </niobject>
 
-    <niobject name="NiRotData" abstract="0" inherit="NiObject">
+    <niobject name="NiRotData" inherit="NiObject">
         Wrapper for rotation animation keys.
         <add name="Num Rotation Keys" type="uint" />
         <add name="Rotation Type" type="KeyType" cond="Num Rotation Keys != 0" />
@@ -4056,13 +4056,13 @@
         <add name="XYZ Rotations" type="KeyGroup" template="float" arr1="3" cond="Rotation Type == 4" />
     </niobject>
 
-    <niobject name="NiPSysAgeDeathModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysAgeDeathModifier" inherit="NiPSysModifier">
         Particle modifier that controls and updates the age of particles in the system.
         <add name="Spawn on Death" type="bool">Should the particles spawn on death?</add>
         <add name="Spawn Modifier" type="Ref" template="NiPSysSpawnModifier">The spawner to use on death.</add>
     </niobject>
 
-    <niobject name="NiPSysBombModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysBombModifier" inherit="NiPSysModifier">
         Particle modifier that applies an explosive force to particles.
         <add name="Bomb Object" type="Ptr" template="NiNode">The object whose position and orientation are the basis of the force.</add>
         <add name="Bomb Axis" type="Vector3">The local direction of the force.</add>
@@ -4072,35 +4072,35 @@
         <add name="Symmetry Type" type="SymmetryType" />
     </niobject>
 
-    <niobject name="NiPSysBoundUpdateModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysBoundUpdateModifier" inherit="NiPSysModifier">
         Particle modifier that creates and updates bound volumes.
         <add name="Update Skip" type="ushort">Optimize by only computing the bound of (1 / Update Skip) of the total particles each frame.</add>
     </niobject>
 
-    <niobject name="NiPSysBoxEmitter" abstract="0" inherit="NiPSysVolumeEmitter">
+    <niobject name="NiPSysBoxEmitter" inherit="NiPSysVolumeEmitter">
         Particle emitter that uses points within a defined Box shape to emit from.
         <add name="Width" type="float" />
         <add name="Height" type="float" />
         <add name="Depth" type="float" />
     </niobject>
 
-    <niobject name="NiPSysColliderManager" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysColliderManager" inherit="NiPSysModifier">
         Particle modifier that adds a defined shape to act as a collision object for particles to interact with.
         <add name="Collider" type="Ref" template="NiPSysCollider" />
     </niobject>
 
-    <niobject name="NiPSysColorModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysColorModifier" inherit="NiPSysModifier">
         Particle modifier that adds keyframe data to modify color/alpha values of particles over time.
         <add name="Data" type="Ref" template="NiColorData" />
     </niobject>
 
-    <niobject name="NiPSysCylinderEmitter" abstract="0" inherit="NiPSysVolumeEmitter">
+    <niobject name="NiPSysCylinderEmitter" inherit="NiPSysVolumeEmitter">
         Particle emitter that uses points within a defined Cylinder shape to emit from.
         <add name="Radius" type="float" />
         <add name="Height" type="float" />
     </niobject>
 
-    <niobject name="NiPSysDragModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysDragModifier" inherit="NiPSysModifier">
         Particle modifier that applies a linear drag force to particles.
         <add name="Drag Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the force.</add>
         <add name="Drag Axis" type="Vector3" default="1.0, 0.0, 0.0">The local direction of the force.</add>
@@ -4109,14 +4109,14 @@
         <add name="Range Falloff" type="float" default="3.402823466e+38">The distance at which particles cease to be affected.</add>
     </niobject>
 
-    <niobject name="NiPSysEmitterCtlrData" abstract="0" inherit="NiObject">
+    <niobject name="NiPSysEmitterCtlrData" inherit="NiObject">
         DEPRECATED (10.2). Particle system emitter controller data.
         <add name="Birth Rate Keys" type="KeyGroup" template="float" />
         <add name="Num Active Keys" type="uint" />
         <add name="Active Keys" type="Key" arg="1" template="byte" arr1="Num Active Keys" />
     </niobject>
 
-    <niobject name="NiPSysGravityModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysGravityModifier" inherit="NiPSysModifier">
         Particle modifier that applies a gravitational force to particles.
         <add name="Gravity Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the force.</add>
         <add name="Gravity Axis" type="Vector3" default="1.0, 0.0, 0.0">The local direction of the force.</add>
@@ -4128,7 +4128,7 @@
         <add name="World Aligned" type="bool" vercond="User Version 2 &gt; 16" />
     </niobject>
 
-    <niobject name="NiPSysGrowFadeModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysGrowFadeModifier" inherit="NiPSysModifier">
         Particle modifier that controls the time it takes to grow and shrink a particle.
         <add name="Grow Time" type="float">The time taken to grow from 0 to their specified size.</add>
         <add name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</add>
@@ -4137,7 +4137,7 @@
         <add name="Base Scale" type="float" vercond="User Version 2 &gt;= 34">A multiplier on the base particle scale.</add>
     </niobject>
 
-    <niobject name="NiPSysMeshEmitter" abstract="0" inherit="NiPSysEmitter">
+    <niobject name="NiPSysMeshEmitter" inherit="NiPSysEmitter">
         Particle emitter that uses points on a specified mesh to emit from.
         <add name="Num Emitter Meshes" type="uint" />
         <add name="Emitter Meshes" type="Ptr" template="NiAVObject" arr1="Num Emitter Meshes">The meshes which are emitted from.</add>
@@ -4146,32 +4146,32 @@
         <add name="Emission Axis" type="Vector3" default="1.0, 0.0, 0.0">The emission axis if VELOCITY_USE_DIRECTION.</add>
     </niobject>
 
-    <niobject name="NiPSysMeshUpdateModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysMeshUpdateModifier" inherit="NiPSysModifier">
         Particle modifier that updates mesh particles using the age of each particle.
         <add name="Num Meshes" type="uint" />
         <add name="Meshes" type="Ref" template="NiAVObject" arr1="Num Meshes" />
     </niobject>
     
-    <niobject name="BSPSysInheritVelocityModifier"  abstract="0" inherit="NiPSysModifier">
+    <niobject name="BSPSysInheritVelocityModifier" inherit="NiPSysModifier">
         <add name="Target" type="Ptr" template="NiNode" />
         <add name="Chance To Inherit" type="float" />
         <add name="Velocity Multiplier" type="float" />
         <add name="Velocity Variation" type="float" />
     </niobject>
     
-    <niobject name="BSPSysHavokUpdateModifier"  abstract="0" inherit="NiPSysModifier">
+    <niobject name="BSPSysHavokUpdateModifier" inherit="NiPSysModifier">
         <add name="Num Nodes" type="uint" />
         <add name="Nodes" type="Ref" template="NiNode" arr1="Num Nodes" />
         <add name="Modifier" type="Ref" template="NiPSysModifier" />
     </niobject>   
 
-    <niobject name="BSPSysRecycleBoundModifier"  abstract="0" inherit="NiPSysModifier">
+    <niobject name="BSPSysRecycleBoundModifier" inherit="NiPSysModifier">
         <add name="Bound Offset" type="Vector3" />
         <add name="Bound Extent" type="Vector3" />
         <add name="Target" type="Ptr" template="NiNode" />
     </niobject> 
     
-    <niobject name="BSPSysSubTexModifier"  abstract="0" inherit="NiPSysModifier">
+    <niobject name="BSPSysSubTexModifier" inherit="NiPSysModifier">
         Similar to a Flip Controller, this handles particle texture animation on a single texture atlas
         <add name="Start Frame" type="uint">Starting frame/position on atlas</add>
         <add name="Start Frame Fudge" type="float">Random chance to start on a different frame?</add>
@@ -4182,7 +4182,7 @@
         <add name="Frame Count Fudge" type="float" />
     </niobject>
     
-    <niobject name="NiPSysPlanarCollider" abstract="0" inherit="NiPSysCollider">
+    <niobject name="NiPSysPlanarCollider" inherit="NiPSysCollider">
         Particle Collider object which particles will interact with.
         <add name="Width" type="float">Width of the plane along the X Axis.</add>
         <add name="Height" type="float">Height of the plane along the Y Axis.</add>
@@ -4190,20 +4190,20 @@
         <add name="Y Axis" type="Vector3">Axis defining a plane, relative to Collider Object.</add>
     </niobject>
 
-    <niobject name="NiPSysSphericalCollider" abstract="0" inherit="NiPSysCollider">
+    <niobject name="NiPSysSphericalCollider" inherit="NiPSysCollider">
         Particle Collider object which particles will interact with.
         <add name="Radius" type="float" />
     </niobject>
 
-    <niobject name="NiPSysPositionModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysPositionModifier" inherit="NiPSysModifier">
         Particle modifier that updates the particle positions based on velocity and last update time.
     </niobject>
 
-    <niobject name="NiPSysResetOnLoopCtlr" abstract="0" inherit="NiTimeController">
+    <niobject name="NiPSysResetOnLoopCtlr" inherit="NiTimeController">
         Particle modifier that calls reset on a target upon looping.
     </niobject>
 
-    <niobject name="NiPSysRotationModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysRotationModifier" inherit="NiPSysModifier">
         Particle modifier that adds rotations to particles.
         <add name="Rotation Speed" type="float">Initial Rotation Speed in radians per second.</add>
         <add name="Rotation Speed Variation" type="float" ver1="20.0.0.2">Distributes rotation speed over the range [Speed - Variation, Speed + Variation].</add>
@@ -4214,7 +4214,7 @@
         <add name="Axis" type="Vector3" default="1.0, 0.0, 0.0">Initial rotation axis.</add>
     </niobject>
 
-    <niobject name="NiPSysSpawnModifier" abstract="0" inherit="NiPSysModifier">
+    <niobject name="NiPSysSpawnModifier" inherit="NiPSysModifier">
         Particle modifier that spawns additional copies of a particle.
         <add name="Num Spawn Generations" type="ushort" default="0">Number of allowed generations for spawning. Particles whose generations are >= will not be spawned.</add>
         <add name="Percentage Spawned" type="float" default="1.0">The likelihood of a particular particle being spawned. Must be between 0.0 and 1.0.</add>
@@ -4227,12 +4227,12 @@
         <add name="Life Span Variation" type="float">The amount the lifespan can vary.</add>
     </niobject>
 
-    <niobject name="NiPSysSphereEmitter" abstract="0" inherit="NiPSysVolumeEmitter">
+    <niobject name="NiPSysSphereEmitter" inherit="NiPSysVolumeEmitter">
         Particle emitter that uses points within a sphere shape to emit from.
         <add name="Radius" type="float" />
     </niobject>
 
-    <niobject name="NiPSysUpdateCtlr" abstract="0" inherit="NiTimeController">
+    <niobject name="NiPSysUpdateCtlr" inherit="NiTimeController">
         Particle system controller, tells the system to update its simulation.
     </niobject>
 
@@ -4338,7 +4338,7 @@
         <add name="Spread" type="float">The angle of the air field cone if Enable Spread is true.</add>
     </niobject>
     
-    <niobject name="NiPSysTrailEmitter" abstract="0" inherit="NiPSysEmitter">
+    <niobject name="NiPSysTrailEmitter" inherit="NiPSysEmitter">
         Guild 2-Specific node
         <add name="Unknown Int 1" type="int">Unknown</add>
         <add name="Unknown Float 1" type="float">Unknown</add>
@@ -4366,14 +4366,14 @@
         Abstract class used for different types of LOD selections.
     </niobject>
 
-    <niobject name="NiRangeLODData" abstract="0" inherit="NiLODData">
+    <niobject name="NiRangeLODData" inherit="NiLODData">
         NiRangeLODData controls switching LOD levels based on Z depth from the camera to the NiLODNode.
         <add name="LOD Center" type="Vector3" />
         <add name="Num LOD Levels" type="uint" />
         <add name="LOD Levels" type="LODRange" arr1="Num LOD Levels" />
     </niobject>
 
-    <niobject name="NiScreenLODData" abstract="0" inherit="NiLODData">
+    <niobject name="NiScreenLODData" inherit="NiLODData">
         NiScreenLODData controls switching LOD levels based on proportion of the screen that a bound would include.
         <add name="Bound" type="NiBound" />
         <add name="World Bound" type="NiBound" />
@@ -4381,23 +4381,23 @@
         <add name="Proportion Levels" type="float" arr1="Num Proportions" />
     </niobject>
 
-    <niobject name="NiRotatingParticles" abstract="0" inherit="NiParticles">
+    <niobject name="NiRotatingParticles" inherit="NiParticles">
         Unknown.
     </niobject>
 
-    <niobject name="NiSequenceStreamHelper" abstract="0" inherit="NiObjectNET">
+    <niobject name="NiSequenceStreamHelper" inherit="NiObjectNET">
         DEPRECATED (pre-10.1), REMOVED (20.3).
         Keyframe animation root node, in .kf files.
     </niobject>
 
-    <niobject name="NiShadeProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiShadeProperty" inherit="NiProperty">
         Determines whether flat shading or smooth shading is used on a shape.
         <add name="Flags" type="Flags" default="1" vercond="(User Version 2 &lt;= 34)">
             Bit 0: Enable smooth phong shading on this shape. Otherwise, hard-edged flat shading will be used on this shape.
         </add>
     </niobject>
 
-    <niobject name="NiSkinData" abstract="0" inherit="NiObject">
+    <niobject name="NiSkinData" inherit="NiObject">
         Skinning data.
         <add name="Skin Transform" type="NiTransform">Offset of the skin from this bone in bind position.</add>
         <add name="Num Bones" type="uint">Number of bones.</add>
@@ -4406,7 +4406,7 @@
         <add name="Bone List" type="BoneData" arr1="Num Bones" arg="Has Vertex Weights">Contains offset data for each node that this skin is influenced by.</add>
     </niobject>
 
-    <niobject name="NiSkinInstance" abstract="0" inherit="NiObject">
+    <niobject name="NiSkinInstance" inherit="NiObject">
         Skinning instance.
         <add name="Data" type="Ref" template="NiSkinData">Skinning data reference.</add>
         <add name="Skin Partition" type="Ref" template="NiSkinPartition" ver1="10.1.0.101">Refers to a NiSkinPartition objects, which partitions the mesh such that every vertex is only influenced by a limited number of bones.</add>
@@ -4415,7 +4415,7 @@
         <add name="Bones" type="Ptr" template="NiNode" arr1="Num Bones">List of all armature bones.</add>
     </niobject>
 
-    <niobject name="NiTriShapeSkinController" abstract="0" inherit="NiTimeController">
+    <niobject name="NiTriShapeSkinController" inherit="NiTimeController">
         Old version of skinning instance.
         <add name="Num Bones" type="uint">The number of node bones referenced as influences.</add>
         <add name="Vertex Counts" type="uint" arr1="Num Bones">The number of vertex weights stored for each bone.</add>
@@ -4423,11 +4423,11 @@
         <add name="Bone Data" type="OldSkinData" arr1="Num Bones" arr2="Vertex Counts">Contains skin weight data for each node that this skin is influenced by.</add>
     </niobject>
 
-    <niobject name="NiClodSkinInstance" abstract="0" inherit="NiSkinInstance">
+    <niobject name="NiClodSkinInstance" inherit="NiSkinInstance">
         A copy of NISkinInstance for use with NiClod meshes.
     </niobject>
 
-    <niobject name="NiSkinPartition" abstract="0" inherit="NiObject">
+    <niobject name="NiSkinPartition" inherit="NiObject">
         Skinning data, optimized for hardware skinning. The mesh is partitioned in submeshes such that each vertex of a submesh is influenced only by a limited and fixed number of bones.
         <add name="Num Skin Partition Blocks" type="uint" />
 		<add name="Skin Partition Blocks" type="SkinPartition" arr1="Num Skin Partition Blocks" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 == 100))">Skin partition objects.</add>
@@ -4449,7 +4449,7 @@
         <add name="Alpha Format" type="AlphaFormat" default="ALPHA_DEFAULT">Requests no alpha, 1-bit alpha, or </add>
     </compound>
 
-    <niobject name="NiSourceTexture" abstract="0" inherit="NiTexture">
+    <niobject name="NiSourceTexture" inherit="NiTexture">
         Describes texture source and properties.
         <add name="Use External" type="byte" default="1">Is the texture external?</add>
         <add name="File Name" type="FilePath" cond="Use External == 1">The external texture file name.</add>
@@ -4463,12 +4463,12 @@
         <add name="Persist Render Data" type="bool" default="0" ver1="20.2.0.4">Pixel Data is NiPersistentSrcTextureRendererData instead of NiPixelData.</add>
     </niobject>
 
-    <niobject name="NiSpecularProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiSpecularProperty" inherit="NiProperty">
         Gives specularity to a shape. Flags 0x0001.
         <add name="Flags" type="Flags">Bit 0 = Enable specular lighting on this shape.</add>
     </niobject>
 
-    <niobject name="NiSphericalCollider" abstract="0" inherit="NiParticleModifier">
+    <niobject name="NiSphericalCollider" inherit="NiParticleModifier">
         LEGACY (pre-10.1) particle modifier.
         <add name="Unknown Float 1" type="float">Unknown.</add>
         <add name="Unknown Short 1" type="ushort">Unknown.</add>
@@ -4479,14 +4479,14 @@
         <add name="Unknown Float 5" type="float">Unknown.</add>
     </niobject>
 
-    <niobject name="NiSpotLight" abstract="0" inherit="NiPointLight">
+    <niobject name="NiSpotLight" inherit="NiPointLight">
         A spot.
         <add name="Outer Spot Angle" type="float" />
         <add name="Inner Spot Angle" type="float" ver1="20.2.0.5" />
         <add name="Exponent" type="float" default="1.0">Describes the distribution of light. (see: glLight)</add>
     </niobject>
 
-    <niobject name="NiStencilProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiStencilProperty" inherit="NiProperty">
         Allows control of stencil testing.
         <add name="Flags" type="Flags" ver2="10.0.1.2">Property flags.</add>
         <add name="Stencil Enabled" type="byte" ver2="20.0.0.5">Enables or disables the stencil test.</add>
@@ -4510,32 +4510,32 @@
         <add name="Stencil Mask" type="uint" default="4294967295" ver1="20.1.0.3">A bit mask. The default is 0xffffffff.</add>
     </niobject>
 
-    <niobject name="NiStringExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiStringExtraData" inherit="NiExtraData">
         Apparently commands for an optimizer instructing it to keep things it would normally discard.
         Also refers to NiNode objects (through their name) in animation .kf files.
         <add name="Bytes Remaining" type="uint" ver2="4.2.2.0">The number of bytes left in the record.  Equals the length of the following string + 4.</add>
         <add name="String Data" type="string">The string.</add>
     </niobject>
 
-    <niobject name="NiStringPalette" abstract="0" inherit="NiObject">
+    <niobject name="NiStringPalette" inherit="NiObject">
         List of 0x00-seperated strings, which are names of controlled objects and controller types. Used in .kf files in conjunction with NiControllerSequence.
         <add name="Palette" type="StringPalette">A bunch of 0x00 seperated strings.</add>
     </niobject>
 
-    <niobject name="NiStringsExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiStringsExtraData" inherit="NiExtraData">
         List of strings; for example, a list of all bone names.
         <add name="Num Strings" type="uint">Number of strings.</add>
         <add name="Data" type="SizedString" arr1="Num Strings">The strings.</add>
     </niobject>
 
-    <niobject name="NiTextKeyExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiTextKeyExtraData" inherit="NiExtraData">
         Extra data, used to name different animation sequences.
         <add name="Unknown Int 1" type="uint" ver2="4.2.2.0">Unknown.  Always equals zero in all official files.</add>
         <add name="Num Text Keys" type="uint">The number of text keys that follow.</add>
         <add name="Text Keys" type="Key" arg="1" template="string" arr1="Num Text Keys">List of textual notes and at which time they take effect. Used for designating the start and stop of animations and the triggering of sounds.</add>
     </niobject>
 
-    <niobject name="NiTextureEffect" abstract="0" inherit="NiDynamicEffect">
+    <niobject name="NiTextureEffect" inherit="NiDynamicEffect">
         Represents an effect that uses projected textures such as projected lights (gobos), environment maps, and fog maps.
         <add name="Model Projection Matrix" type="Matrix33">Model projection matrix.  Always identity?</add>
         <add name="Model Projection Transform" type="Vector3">Model projection transform.  Always (0,0,0)?</add>
@@ -4553,7 +4553,7 @@
         <add name="Unknown Short" type="ushort" ver2="4.1.0.12">Unknown: 0.</add>
     </niobject>
 
-    <niobject name="NiTextureModeProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiTextureModeProperty" inherit="NiProperty">
         LEGACY (pre-10.1)
         <add name="Unknown Ints" type="uint" arr1="3" ver2="2.3" />
         <add name="Unknown Short" type="short" ver1="3.0">Unknown. Either 210 or 194.</add>
@@ -4561,7 +4561,7 @@
         <add name="PS2 K" type="short" default="-75" ver1="3.1" ver2="10.2.0.0">-75?</add>
     </niobject>
 
-    <niobject name="NiImage" abstract="0" inherit="NiObject">
+    <niobject name="NiImage" inherit="NiObject">
         LEGACY (pre-10.1)
         <add name="Use External" type="byte">0 if the texture is internal to the NIF file.</add>
         <add name="File Name" type="FilePath" cond="Use External != 0">The filepath to the texture.</add>
@@ -4570,7 +4570,7 @@
         <add name="Unknown Float" type="float" ver1="3.1" default="128.5">Unknown.  Perhaps fImageScale?</add>
     </niobject>
 
-    <niobject name="NiTextureProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiTextureProperty" inherit="NiProperty">
         LEGACY (pre-10.1)
         <add name="Unknown Ints 1" type="uint" arr1="2" ver2="2.3">Property flags.</add>
         <add name="Flags" type="Flags" ver1="3.0">Property flags.</add>
@@ -4578,7 +4578,7 @@
         <add name="Unknown Ints 2" type="uint" arr1="2" ver1="3.0" ver2="3.03">Unknown.  0?</add>
     </niobject>
 
-    <niobject name="NiTexturingProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiTexturingProperty" inherit="NiProperty">
         Describes how a fragment shader should be configured for a given piece of geometry.
         <add name="Flags" type="Flags" ver2="10.0.1.2">Property flags.</add>
         <add name="Flags" type="Flags" ver1="20.1.0.2">Property flags.</add>
@@ -4620,17 +4620,17 @@
         <add name="Shader Textures" type="ShaderTexDesc" arr1="Num Shader Textures" ver1="10.0.1.0">Shader textures.</add>
     </niobject>
 
-    <niobject name="NiMultiTextureProperty" abstract="0" inherit="NiTexturingProperty" />
+    <niobject name="NiMultiTextureProperty" inherit="NiTexturingProperty" />
 
-    <niobject name="NiTransformData" abstract="0" inherit="NiKeyframeData">
+    <niobject name="NiTransformData" inherit="NiKeyframeData">
         Wrapper for transformation animation keys.
     </niobject>
 
-    <niobject name="NiTriShape" abstract="0" inherit="NiTriBasedGeom">
+    <niobject name="NiTriShape" inherit="NiTriBasedGeom">
         A shape node that refers to singular triangle data.
     </niobject>
 
-    <niobject name="NiTriShapeData" abstract="0" inherit="NiTriBasedGeomData">
+    <niobject name="NiTriShapeData" inherit="NiTriBasedGeomData">
         Holds mesh data using a list of singular triangles.
         <add name="Num Triangle Points" type="uint">Num Triangles times 3.</add>
         <add name="Has Triangles" type="bool" ver1="10.1.0.0" calculated="1">Do we have triangle data?</add>
@@ -4640,11 +4640,11 @@
         <add name="Match Groups" type="MatchGroup" arr1="Num Match Groups" ver1="3.1">The shared normals.</add>
     </niobject>
 
-    <niobject name="NiTriStrips" abstract="0" inherit="NiTriBasedGeom">
+    <niobject name="NiTriStrips" inherit="NiTriBasedGeom">
         A shape node that refers to data organized into strips of triangles
     </niobject>
 
-    <niobject name="NiTriStripsData" abstract="0" inherit="NiTriBasedGeomData">
+    <niobject name="NiTriStripsData" inherit="NiTriBasedGeomData">
         Holds mesh data using strips of triangles.
         <add name="Num Strips" type="ushort">Number of OpenGL triangle strips that are present.</add>
         <add name="Strip Lengths" type="ushort" arr1="Num Strips">The number of points in each triangle strip.</add>
@@ -4653,7 +4653,7 @@
         <add name="Points" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="Has Points" ver1="10.0.1.3">The points in the Triangle strips. Size is the sum of all entries in Strip Lengths.</add>
     </niobject>
 
-    <niobject name="NiEnvMappedTriShape" abstract="0" inherit="NiObjectNET">
+    <niobject name="NiEnvMappedTriShape" inherit="NiObjectNET">
         Unknown
         <add name="Unknown 1" type="ushort">unknown (=4 - 5)</add>
         <add name="Unknown Matrix" type="Matrix44">unknown</add>
@@ -4663,11 +4663,11 @@
         <add name="Child 3" type="Ref" template="NiObject">unknown</add>
     </niobject>
 
-    <niobject name="NiEnvMappedTriShapeData" abstract="0" inherit="NiTriShapeData">
+    <niobject name="NiEnvMappedTriShapeData" inherit="NiTriShapeData">
         Holds mesh data using a list of singular triangles.
     </niobject>
 
-    <niobject name="NiBezierTriangle4" abstract="0" inherit="NiObject">
+    <niobject name="NiBezierTriangle4" inherit="NiObject">
         LEGACY (pre-10.1)
         Sub data of NiBezierMesh
         <add name="Unknown 1" type="uint" arr1="6">unknown</add>
@@ -4681,7 +4681,7 @@
         <add name="Unknown 6" type="short" arr1="24">unknown</add>
     </niobject>
 
-    <niobject name="NiBezierMesh" abstract="0" inherit="NiAVObject">
+    <niobject name="NiBezierMesh" inherit="NiAVObject">
         LEGACY (pre-10.1)
         Unknown
         <add name="Num Bezier Triangles" type="uint">references.</add>
@@ -4699,12 +4699,12 @@
 
 
 
-    <niobject name="NiClod" abstract="0" inherit="NiTriBasedGeom">
+    <niobject name="NiClod" inherit="NiTriBasedGeom">
         A shape node that holds continuous level of detail information.
         Seems to be specific to Freedom Force.
     </niobject>
 
-    <niobject name="NiClodData" abstract="0" inherit="NiTriBasedGeomData">
+    <niobject name="NiClodData" inherit="NiTriBasedGeomData">
         Holds mesh data for continuous level of detail shapes.
         Pesumably a progressive mesh with triangles specified by edge splits.
         Seems to be specific to Freedom Force.
@@ -4720,14 +4720,14 @@
         <add name="Unknown Clod Shorts 3" type ="ushort" arr1="Unknown Count 3" arr2="6"></add>
     </niobject>
 
-    <niobject name="NiUVController" abstract="0" inherit="NiTimeController">
+    <niobject name="NiUVController" inherit="NiTimeController">
         DEPRECATED (pre-10.1), REMOVED (20.3).
         Time controller for texture coordinates.
         <add name="Unknown Short" type="ushort">Always 0?</add>
         <add name="Data" type="Ref" template="NiUVData">Texture coordinate controller data index.</add>
     </niobject>
 
-    <niobject name="NiUVData" abstract="0" inherit="NiObject">
+    <niobject name="NiUVData" inherit="NiObject">
         DEPRECATED (pre-10.1), REMOVED (20.3)
         Texture coordinate data.
         <add name="UV Groups" type="KeyGroup" template="float" arr1="4">
@@ -4735,13 +4735,13 @@
         </add>
     </niobject>
 
-    <niobject name="NiVectorExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiVectorExtraData" inherit="NiExtraData">
         DEPRECATED (20.5).
         Extra data in the form of a vector (as x, y, z, w components).
         <add name="Vector Data" type="Vector4">The vector data.</add>
     </niobject>
 
-    <niobject name="NiVertexColorProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiVertexColorProperty" inherit="NiProperty">
         Property of vertex colors. This object is referred to by the root object of the NIF file whenever some NiTriShapeData object has vertex colors with non-default settings; if not present, vertex colors have vertex_mode=2 and lighting_mode=1.
         <add name="Flags" type="Flags">
             Bits 0-2: Unknown
@@ -4752,7 +4752,7 @@
         <add name="Lighting Mode" type="LightMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</add>
     </niobject>
 
-    <niobject name="NiVertWeightsExtraData" abstract="0" inherit="NiExtraData">
+    <niobject name="NiVertWeightsExtraData" inherit="NiExtraData">
         DEPRECATED (10.x), REMOVED (?)
         Not used in skinning.
         Unsure of use - perhaps for morphing animation or gravity.
@@ -4761,14 +4761,14 @@
         <add name="Weight" type="float" arr1="Num Vertices">The vertex weights.</add>
     </niobject>
 
-    <niobject name="NiVisData" abstract="0" inherit="NiObject">
+    <niobject name="NiVisData" inherit="NiObject">
         DEPRECATED (10.2), REMOVED (?), Replaced by NiBoolData.
         Visibility data for a controller.
         <add name="Num Keys" type="uint" />
         <add name="Keys" type="Key" arg="1" template="byte" arr1="Num Keys" />
     </niobject>
 
-    <niobject name="NiWireframeProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiWireframeProperty" inherit="NiProperty">
         Allows applications to switch between drawing solid geometry or wireframe outlines.
         <add name="Flags" type="Flags">
             Property flags.
@@ -4777,7 +4777,7 @@
         </add>
     </niobject>
 
-    <niobject name="NiZBufferProperty" abstract="0" inherit="NiProperty">
+    <niobject name="NiZBufferProperty" inherit="NiProperty">
         Allows applications to set the test and write modes of the renderer's Z-buffer and to set the comparison function used for the Z-buffer test.
         <add name="Flags" type="Flags" default="3">
             Bit 0 enables the z test
@@ -4788,11 +4788,11 @@
         </add>
     </niobject>
 
-    <niobject name="RootCollisionNode" abstract="0" inherit="NiNode">
+    <niobject name="RootCollisionNode" inherit="NiNode">
         Morrowind-specific node for collision mesh.
     </niobject>
 
-    <niobject name="NiRawImageData" abstract="0" inherit="NiObject">
+    <niobject name="NiRawImageData" inherit="NiObject">
         LEGACY (pre-10.1)
         Raw image data.
         <add name="Width" type="uint">Image width</add>
@@ -4804,17 +4804,17 @@
     
     <niobject name="NiAccumulator" abstract="1" inherit="NiObject" />
 
-    <niobject name="NiSortAdjustNode" abstract="0" inherit="NiNode">
+    <niobject name="NiSortAdjustNode" inherit="NiNode">
         Used to turn sorting off for individual subtrees in a scene. Useful if objects must be drawn in a fixed order.
         <add name="Sorting Mode" type="SortingMode" default="SORTING_INHERIT">Sorting</add>
         <add name="Accumulator" type="Ref" template="NiAccumulator" ver2="20.0.0.3" />
     </niobject>
 
-    <niobject name="NiSourceCubeMap" abstract="0" inherit="NiSourceTexture">
+    <niobject name="NiSourceCubeMap" inherit="NiSourceTexture">
         Represents cube maps that are created from either a set of six image files, six blocks of pixel data, or a single pixel data with six faces.
     </niobject>
 
-    <niobject name="NiPhysXProp" abstract="0" inherit="NiObjectNET">
+    <niobject name="NiPhysXProp" inherit="NiObjectNET">
         A PhysX prop which holds information about PhysX actors in a Gamebryo scene
         <add name="PhysX to World Scale" type="float" />
         <add name="Num Sources" type="uint" />
@@ -4838,7 +4838,7 @@
         <add name="Index" type="uint" />
     </compound>
 
-    <niobject name="NiPhysXPropDesc" abstract="0" inherit="NiObject">
+    <niobject name="NiPhysXPropDesc" inherit="NiObject">
         For serialization of PhysX objects and to attach them to the scene.
         <add name="Num Actors" type="int" />
         <add name="Actors" type="Ref" template="NiPhysXActorDesc" arr1="Num Actors" />
@@ -4854,7 +4854,7 @@
         <add name="Flags" type="byte" ver1="20.4.0.0" />
     </niobject>
 
-    <niobject name="NiPhysXActorDesc" abstract="0" inherit="NiObject">
+    <niobject name="NiPhysXActorDesc" inherit="NiObject">
         For serializing NxActor objects.
         <add name="Actor Name" type="string" />
         <add name="Num Poses" type="uint" />
@@ -5027,7 +5027,7 @@
         <add name="Capsule Flags" type="uint" />
     </compound>
 
-    <niobject name="NiPhysXShapeDesc" abstract="0" inherit="NiObject">
+    <niobject name="NiPhysXShapeDesc" inherit="NiObject">
         For serializing NxShapeDesc objects
         <add name="Shape Type" type="NxShapeType" />
         <add name="Local Pose" type="Matrix34" />
@@ -5047,7 +5047,7 @@
         <add name="Mesh" type="Ref" template="NiPhysXMeshDesc" cond="(Shape Type == 5) || (Shape Type == 6)" />
     </niobject>
 
-    <niobject name="NiPhysXMeshDesc" abstract="0" inherit="NiObject">
+    <niobject name="NiPhysXMeshDesc" inherit="NiObject">
         Holds mesh data for streaming.
         <add name="Is Convex" type="bool" ver2="20.3.0.4" />
         <add name="Mesh Name" type="string" />
@@ -5096,7 +5096,7 @@
         <add name="Spring" type="NxSpringDesc" ver2="20.2.3.0" cond="Has Spring" />
     </compound>
 
-    <niobject name="NiPhysXMaterialDesc" abstract="0" inherit="NiObject">
+    <niobject name="NiPhysXMaterialDesc" inherit="NiObject">
         For serializing NxMaterialDesc objects.
         <add name="Index" type="ushort" />
         <add name="Num States" type="uint" />
@@ -5232,7 +5232,7 @@
         <add name="Unknown Float 3" type="float">Unknowns</add>
     </niobject>
     -->
-    <niobject name="BSFadeNode" abstract="0" inherit="NiNode">
+    <niobject name="BSFadeNode" inherit="NiNode">
         Bethesda-specific fade node.
     </niobject>
 
@@ -5320,7 +5320,7 @@
         <option value="31" name="Unknown10">Unknown</option>
     </bitflags>
     
-    <niobject name="BSShaderProperty" abstract="0" inherit="NiShadeProperty">
+    <niobject name="BSShaderProperty" inherit="NiShadeProperty">
         Bethesda-specific property.
         <add name="Shader Type" type="BSShaderType" default="SHADER_DEFAULT" vercond="(User Version 2 &lt;= 34)" />
         <add name="Shader Flags" type="BSShaderFlags" default="0x82000000" vercond="(User Version 2 &lt;= 34)" />
@@ -5333,7 +5333,7 @@
         <add name="Texture Clamp Mode" type="TexClampMode" default="3" vercond="(User Version 2 &lt;= 34)">How to handle texture borders.</add>
     </niobject>
 
-    <niobject name="BSShaderNoLightingProperty" abstract="0" inherit="BSShaderLightingProperty">
+    <niobject name="BSShaderNoLightingProperty" inherit="BSShaderLightingProperty">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">The texture glow map.</add>
         <add name="Falloff Start Angle" type="float" default="1.0" vercond="(User Version 2 &gt; 26)">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
@@ -5342,7 +5342,7 @@
         <add name="Falloff Stop Opacity" type="float" default="0.0" vercond="(User Version 2 &gt; 26)">Alpha falloff multiplier at end angle</add>
     </niobject>
 
-    <niobject name="BSShaderPPLightingProperty" abstract="0" inherit="BSShaderLightingProperty">
+    <niobject name="BSShaderPPLightingProperty" inherit="BSShaderLightingProperty">
         Bethesda-specific property.
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set</add>
         <add name="Refraction Strength" type="float" default="0.0" vercond="(User Version 2 &gt; 14)">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
@@ -5354,7 +5354,7 @@
     </niobject>
 
     <!-- Skyrim specific Node -->
-    <niobject name="BSEffectShaderPropertyFloatController" abstract="0" inherit="NiFloatInterpController">
+    <niobject name="BSEffectShaderPropertyFloatController" inherit="NiFloatInterpController">
         This controller is used to animate float variables in BSEffectShaderProperty.
         <add name="Type of Controlled Variable" type="EffectShaderControlledVariable">Which float variable in BSEffectShaderProperty to animate:</add>
     </niobject>
@@ -5364,19 +5364,19 @@
 		<add name="Type of Controlled Color" type="EffectShaderControlledColor">Which color in BSEffectShaderProperty to animate:</add>
 	</niobject>
 	
-	<niobject name="BSLightingShaderPropertyFloatController" abstract="0" inherit="NiFloatInterpController">
+	<niobject name="BSLightingShaderPropertyFloatController" inherit="NiFloatInterpController">
 		This controller is used to animate float variables in BSLightingShaderProperty.
 		<add name="Type of Controlled Variable" type="LightingShaderControlledVariable">Which float variable in BSLightingShaderProperty to animate:</add>
 	</niobject>
 	
-	<niobject name="BSLightingShaderPropertyColorController" abstract="0" inherit="NiPoint3InterpController">
+	<niobject name="BSLightingShaderPropertyColorController" inherit="NiPoint3InterpController">
 		This controller is used to animate colors in BSLightingShaderProperty.
 		<add name="Type of Controlled Color" type="LightingShaderControlledColor">Which color in BSLightingShaderProperty to animate:</add>
 	</niobject>	
 	
 	<niobject name="BSNiAlphaPropertyTestRefController" inherit="NiFloatInterpController" />
 	
-	<niobject name="BSProceduralLightningController" abstract="0" inherit="NiTimeController">
+	<niobject name="BSProceduralLightningController" inherit="NiTimeController">
     Skyrim, Paired with dummy TriShapes, this controller generates lightning shapes for special effects.
     First interpolator controls Generation.
         <add name="Interpolator 1: Generation" type="Ref" template="NiInterpolator">References generation interpolator.</add>
@@ -5402,7 +5402,7 @@
         <add name="Shader Property" type="Ref" template="BSShaderProperty">Reference to a shader property.</add>
 	</niobject>
 
-   <niobject name="BSShaderTextureSet" abstract="0" inherit="NiObject">
+   <niobject name="BSShaderTextureSet" inherit="NiObject">
         Bethesda-specific Texture Set.
         <add name="Num Textures" type="int" default="6" />
         <add name="Textures" type="SizedString" arr1="Num Textures">Textures.
@@ -5417,7 +5417,7 @@
         </add>
     </niobject>
 
-    <niobject name="WaterShaderProperty" abstract="0" inherit="BSShaderProperty">
+    <niobject name="WaterShaderProperty" inherit="BSShaderProperty">
         Bethesda-specific property. Found in Fallout3
     </niobject>
 
@@ -5430,39 +5430,39 @@
         <option value="5" name="BSSM_SKY_STARS">BSSM_Sky_Stars</option>
         <option value="7" name="BSSM_SKY_MOON_STARS_MASK">BSSM_Sky_Moon_Stars_Mask</option>
     </enum>
-    <niobject name="SkyShaderProperty" abstract="0" inherit="BSShaderLightingProperty">
+    <niobject name="SkyShaderProperty" inherit="BSShaderLightingProperty">
         Bethesda-specific property. Found in Fallout3
         <add name="File Name" type="SizedString">The texture.</add>
         <add name="Sky Object Type" type="SkyObjectType">Sky Object Type</add>
     </niobject>
 
-    <niobject name="TileShaderProperty" abstract="0" inherit="BSShaderLightingProperty">
+    <niobject name="TileShaderProperty" inherit="BSShaderLightingProperty">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">Texture file name</add>
     </niobject>
 
-    <niobject name="DistantLODShaderProperty" abstract="0" inherit="BSShaderProperty">
+    <niobject name="DistantLODShaderProperty" inherit="BSShaderProperty">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="BSDistantTreeShaderProperty" abstract="0" inherit="BSShaderProperty">
+    <niobject name="BSDistantTreeShaderProperty" inherit="BSShaderProperty">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="TallGrassShaderProperty" abstract="0" inherit="BSShaderProperty">
+    <niobject name="TallGrassShaderProperty" inherit="BSShaderProperty">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">Texture file name</add>
     </niobject>
 
-    <niobject name="VolumetricFogShaderProperty" abstract="0" inherit="BSShaderProperty">
+    <niobject name="VolumetricFogShaderProperty" inherit="BSShaderProperty">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="HairShaderProperty" abstract="0" inherit="BSShaderProperty">
+    <niobject name="HairShaderProperty" inherit="BSShaderProperty">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="Lighting30ShaderProperty" abstract="0" inherit="BSShaderPPLightingProperty">
+    <niobject name="Lighting30ShaderProperty" inherit="BSShaderPPLightingProperty">
         Bethesda-specific property.
     </niobject>
 
@@ -5610,7 +5610,7 @@
         <option value="31" name="Refraction_Writes_Depth" />
     </bitflags>
 
-    <niobject name="BSLightingShaderProperty"  abstract="0" inherit="BSShaderProperty">
+    <niobject name="BSLightingShaderProperty" inherit="BSShaderProperty">
         Bethesda shader property for Skyrim and later.
         <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="(User Version 2 != 130)" default="2185233153">Skyrim Shader Flags for setting render/shader options.</add>
         <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="(User Version 2 != 130)" default="32801">Skyrim Shader Flags for setting render/shader options.</add>
@@ -5659,7 +5659,7 @@
         <add name="Right Eye Reflection Center" type="Vector3" cond="Skyrim Shader Type == 16">Offset to set center for right eye cubemap</add>
     </niobject>
 
-    <niobject name="BSEffectShaderProperty" abstract="0" inherit="BSShaderProperty">
+    <niobject name="BSEffectShaderProperty" inherit="BSShaderProperty">
         Bethesda effect shader property for Skyrim and later.
         <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="2147483648" vercond="(User Version 2 != 130)" />
         <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="32" vercond="(User Version 2 != 130)" />
@@ -5719,7 +5719,7 @@
         <add name="Sky Object Type" type="SkyObjectType" />
     </niobject>
 
-    <niobject name="BSDismemberSkinInstance" abstract="0" inherit="NiSkinInstance">
+    <niobject name="BSDismemberSkinInstance" inherit="NiSkinInstance">
         Bethesda-specific skin instance.
         <add name="Num Partitions" type="int" />
         <add name="Partitions" type="BodyPartList" arr1="Num Partitions" />
@@ -5826,12 +5826,12 @@
     </niobject>
 
 
-    <niobject name="BSRefractionFirePeriodController" abstract="0" inherit="NiTimeController">
+    <niobject name="BSRefractionFirePeriodController" inherit="NiTimeController">
         Bethesda-specific time controller.
         <add name="Interpolator" type="Ref" template="NiInterpolator" ver1="20.2.0.7" />
     </niobject>
 
-    <niobject name="bhkConvexListShape" abstract="0" inherit="bhkShape">
+    <niobject name="bhkConvexListShape" inherit="bhkShape">
         A havok shape.
         A list of convex shapes.
 
@@ -5858,7 +5858,7 @@
         <add name="Transform 2" type="NiQuatTransform" />
     </compound>
 
-    <niobject name="BSTreadTransfInterpolator" abstract="0" inherit="NiInterpolator">
+    <niobject name="BSTreadTransfInterpolator" inherit="NiInterpolator">
         Bethesda-specific interpolator.
         <add name="Num Tread Transforms" type="int" />
         <add name="Tread Transforms" type="BSTreadTransform" arr1="Num Tread Transforms" />
@@ -5872,7 +5872,7 @@
         <option value="2" name="ANT_LOOKIK">ANT_LOOKIK</option>
     </enum>
 
-    <niobject name="BSAnimNote" abstract="0" inherit="NiObject">
+    <niobject name="BSAnimNote" inherit="NiObject">
         Bethesda-specific object.
         <add name="Type" type="AnimNoteType">Type of this note.</add>
         <add name="Time" type="float">Location in time.</add>
@@ -5881,7 +5881,7 @@
         <add name="State" type="uint" cond="Type == 2">Unknown.</add>
     </niobject>
 
-    <niobject name="BSAnimNotes" abstract="0" inherit="NiObject">
+    <niobject name="BSAnimNotes" inherit="NiObject">
         Bethesda-specific object.
         <add name="Num Anim Notes" type="ushort">Number of BSAnimNote objects.</add>
         <add name="Anim Notes" type="Ref" template="BSAnimNote" arr1="Num Anim Notes">BSAnimNote objects.</add>
@@ -6041,14 +6041,14 @@
         Bethesda-Specific node.
     </niobject>
 
-    <niobject name="bhkBreakableConstraint" abstract="0" inherit="bhkConstraint">
+    <niobject name="bhkBreakableConstraint" inherit="bhkConstraint">
         A breakable constraint.
         <add name="Constraint Data" type="ConstraintData">Constraint within constraint.</add>
         <add name="Threshold" type="float">Amount of force to break the rigid bodies apart?</add>
         <add name="Remove When Broken" type="bool" default="0">No: Constraint stays active. Yes: Constraint gets removed when breaking threshold is exceeded.</add>
     </niobject>
 
-    <niobject name="bhkOrientHingedBodyAction" abstract="0" inherit="bhkSerializable">
+    <niobject name="bhkOrientHingedBodyAction" inherit="bhkSerializable">
         Bethesda-Specific Havok serializable.
         <add name="Body" type="Ptr" template="bhkRigidBody" />
         <add name="Unknown Int 1" type="uint" />
@@ -6189,7 +6189,7 @@
     </bitflags>
 
 
-    <niobject name="NiDataStream" inherit="NiObject" abstract="0">
+    <niobject name="NiDataStream" inherit="NiObject">
         <add name="Usage" type="DataStreamUsage" abstract="1"></add>
         <add name="Access" type="DataStreamAccess" abstract="1"></add>
         <add name="Num Bytes" type="uint">The size in bytes of this data stream.</add>
@@ -7024,7 +7024,7 @@
 	</niobject>
 	
     <!-- Skyrim specific blocks -->
-    <niobject name="BSInvMarker" abstract="0" inherit="NiExtraData">
+    <niobject name="BSInvMarker" inherit="NiExtraData">
     Orientation marker for Skyrim's inventory view.
         How to show the nif in the player's inventory.
         Typically attached to the root node of the nif tree.
@@ -7083,7 +7083,7 @@
     
     <!-- Fallout 4 Geometry -->
     
-    <niobject name="BSTriShape" abstract="0" inherit="NiAVObject">
+    <niobject name="BSTriShape" inherit="NiAVObject">
         Fallout 4 Tri Shape
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Skin" type="Ref" template="NiObject" />
@@ -7312,7 +7312,7 @@
 		<add name="Vertices" type="Vector4" arr1="Num Vertices" cond="Vertex Data Size &gt; 0" />
 	</niobject>
 	
-	<niobject name="BSDistantObjectLargeRefExtraData" abstract="0" inherit="NiExtraData">
+	<niobject name="BSDistantObjectLargeRefExtraData" inherit="NiExtraData">
         Large ref flag.
 		<add name="Large Ref" type="bool" />
 	</niobject>

From b8adcddd780ccdda2fbee708f966f289ff07368a Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 15 May 2018 21:28:20 -0400
Subject: [PATCH 02/86] NiPSFieldForce decoding

---
 nif.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/nif.xml b/nif.xml
index fcd303b..c6c8982 100644
--- a/nif.xml
+++ b/nif.xml
@@ -6568,6 +6568,15 @@
         <add name="Active" type="bool" />
     </niobject>
 
+    <niobject name="NiPSFieldForce" abstract="1" inherit="NiPSForce">
+        Abstract base class for all particle field forces.
+        <add name="Field Object" type="Ref" />
+        <add name="Magnitude" type="float" />
+        <add name="Attenuation" type="float" />
+        <add name="Use Max Distance" type="bool" />
+        <add name="Max Distance" type="float" />
+    </niobject>
+
     <niobject name="NiPSDragForce" inherit="NiPSForce">
         Applies a linear drag force to particles.
         <add name="Drag Axis" type="Vector3" />
@@ -6598,6 +6607,42 @@
         <add name="Bomb Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
+    <niobject name="NiPSAirFieldForce" inherit="NiPSFieldForce">
+        Inside a field, updates particle velocity to simulate the effects of air movements.
+        <add name="Direction" type="Vector3" />
+        <add name="Air Friction" type="float" />
+        <add name="Inherited Velocity" type="float" />
+        <add name="Inherit Rotation" type="bool" />
+        <add name="Enable Spread" type="bool" />
+        <add name="Spread" type="float" />
+    </niobject>
+
+    <niobject name="NiPSGravityFieldForce" inherit="NiPSFieldForce">
+        Inside a field, updates particle velocity to simulate the effects of directional gravity.
+        <add name="Direction" type="Vector3" />
+    </niobject>
+
+    <niobject name="NiPSDragFieldForce" inherit="NiPSFieldForce">
+        Inside a field, updates particle velocity to simulate the effects of drag.
+        <add name="Use Direction" type="bool" />
+        <add name="Direction" type="Vector3" />
+    </niobject>
+
+    <niobject name="NiPSRadialFieldForce" inherit="NiPSFieldForce">
+        Inside a field, updates particle velocity to simulate the effects of point gravity.
+        <add name="Radial Factor" type="float" />
+    </niobject>
+
+    <niobject name="NiPSTurbulenceFieldForce" inherit="NiPSFieldForce">
+        Inside a field, updates particle velocity to simulate the effects of turbulence.
+        <add name="Frequency" type="float" />
+    </niobject>
+
+    <niobject name="NiPSVortexFieldForce" inherit="NiPSFieldForce">
+        Inside a field, updates particle velocity to simulate the effects of a vortex.
+        <add name="Direction" type="Vector3" />
+    </niobject>
+
     <!-- NiPS Emitters -->
 
     <niobject name="NiPSEmitter" abstract="1" inherit="NiObject">
@@ -6695,6 +6740,18 @@
         Animates the strength value of an NiPSGravityForce object.
     </niobject>
 
+    <niobject name="NiPSFieldAttenuationCtlr" inherit="NiPSForceFloatCtlr">
+        Animates the attenuation value of an NiPSFieldForce object.
+    </niobject>
+
+    <niobject name="NiPSFieldMagnitudeCtlr" inherit="NiPSForceFloatCtlr">
+        Animates the magnitude value of an NiPSFieldForce object.
+    </niobject>
+
+    <niobject name="NiPSFieldMaxDistanceCtlr" inherit="NiPSForceFloatCtlr">
+        Animates the max distance value of an NiPSFieldForce object.
+    </niobject>
+
     <niobject name="NiPSEmitterSpeedCtlr" inherit="NiPSEmitterFloatCtlr">
         Animates the speed value on an NiPSEmitter object.
     </niobject>

From 46c95e2857abc4962d969b260a9626003fa674e9 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 15 May 2018 21:57:40 -0400
Subject: [PATCH 03/86] Add missing template for NiPSFieldForce ref

---
 nif.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nif.xml b/nif.xml
index c6c8982..5b98e07 100644
--- a/nif.xml
+++ b/nif.xml
@@ -6570,7 +6570,7 @@
 
     <niobject name="NiPSFieldForce" abstract="1" inherit="NiPSForce">
         Abstract base class for all particle field forces.
-        <add name="Field Object" type="Ref" />
+        <add name="Field Object" type="Ref" template="NiAVObject" />
         <add name="Magnitude" type="float" />
         <add name="Attenuation" type="float" />
         <add name="Use Max Distance" type="bool" />

From e137e0c42ef6ff13800c084472ab8d74067015c2 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Wed, 16 May 2018 07:44:51 -0400
Subject: [PATCH 04/86] NiColor Interp and Extra Data ctlr, NiPSTorusEmitter

---
 nif.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nif.xml b/nif.xml
index 5b98e07..8fb30b9 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2591,6 +2591,12 @@
         Abstract base class for interpolators that use NiAnimationKeys (Key, KeyGrp) for interpolation.
     </niobject>
 
+    <niobject name="NiColorInterpolator" inherit="NiKeyBasedInterpolator">
+        Animates a color value over time.
+        <add name="Value" type="Color4" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
+        <add name="Data" type="Ref" template="NiColorData" />
+    </niobject>
+
     <niobject name="NiFloatInterpolator" inherit="NiKeyBasedInterpolator">
         Uses NiFloatKeys to animate a float value over time.
         <add name="Value" type="float" default="-3.402823466e+38">Pose value if lacking NiFloatData.</add>
@@ -3047,6 +3053,10 @@
         <add name="Extra Data Name" type="string" ver1="10.2.0.0" />
     </niobject>
 
+    <niobject name="NiColorExtraDataController" inherit="NiExtraDataController">
+        Animates an NiColorExtraData object attached to an NiAVObject.
+    </niobject>
+
     <niobject name="NiFloatExtraDataController" inherit="NiExtraDataController">
         Animates an NiFloatExtraData object attached to an NiAVObject.
         NiInterpController::GetCtlrID() string format is same as parent.
@@ -6693,6 +6703,12 @@
         <add name="Emitter Height" type="float" />
     </niobject>
 
+    <niobject name="NiPSTorusEmitter" inherit="NiPSVolumeEmitter">
+        A particle emitter that emits particles from a toroidal volume.
+        <add name="Emitter Radius" type="float" />
+        <add name="Emitter Section Radius" type="float" />
+    </niobject>
+
     <niobject name="NiPSMeshEmitter" inherit="NiPSEmitter">
         Emits particles from one or more NiMesh objects. A random mesh emitter is selected for each particle emission.
         <add name="Num Mesh Emitters" type="uint" />

From c9334fe450296e611e91b38d790231100f376444 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Wed, 16 May 2018 07:53:38 -0400
Subject: [PATCH 05/86] NiPhysXScene, NiPhysXSceneDesc, NiPhysX particles

Scene/SceneDesc were relatively old and unused and also quite complex to implement so they never got ported to XML from the 010 templates.

Note:  Half the files that actually use Scene/SceneDesc are in Empire Earth III, which its version 20.2.0.8 behaves differently for these blocks than other 20.2.0.8 versions.  The only way to tell the difference is by the file extension, which is .nifcache.   This is beyond the scope of nif.xml, and so only the game files that match the version conditions of Gamebryo proper are supported.
---
 nif.xml | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 182 insertions(+), 2 deletions(-)

diff --git a/nif.xml b/nif.xml
index 8fb30b9..7c1a26e 100644
--- a/nif.xml
+++ b/nif.xml
@@ -4824,12 +4824,152 @@
         Represents cube maps that are created from either a set of six image files, six blocks of pixel data, or a single pixel data with six faces.
     </niobject>
 
+    <!-- NiPhysX -->
+
+    <niobject name="NiPhysXScene" inherit="NiObjectNET">
+        Object which manages a NxScene object and the Gamebryo objects that interact with it.
+        <add name="Scene Transform" type="NiTransform" />
+        <add name="PhysX to World Scale" type="float" />
+        <add name="Num Props" type="uint" ver1="20.3.0.2" />
+        <add name="Props" type="Ref" template="NiPhysXProp" arr1="Num Props" ver1="20.3.0.2" />
+        <add name="Num Sources" type="uint" />
+        <add name="Sources" type="Ref" template="NiPhysXSrc" arr1="Num Sources" />
+        <add name="Num Dests" type="uint" />
+        <add name="Dests" type="Ref" template="NiPhysXDest" arr1="Num Dests" />
+        <add name="Num Modified Meshes" type="uint" ver1="20.4.0.0" />
+        <add name="Modified Meshes" type="Ref" template="NiMesh" arr1="Num Modified Meshes" ver1="20.4.0.0" />
+        <add name="Time Step" type="float" ver1="20.2.0.8" />
+        <add name="Keep Meshes" type="bool" ver1="20.2.0.8" ver2="20.3.0.1" />
+        <add name="Num Sub Steps" type="uint" ver1="20.3.0.9" />
+        <add name="Max Sub Steps" type="uint" ver1="20.3.0.9" />
+        <add name="Snapshot" type="Ref" template="NiPhysXSceneDesc" />
+        <add name="Flags" type="ushort" />
+    </niobject>
+
+    <enum name="NiSceneDescNxBroadPhaseType" storage="uint">
+        <option name="NX_BROADPHASE_QUADRATIC" value="0" />
+        <option name="NX_BROADPHASE_FULL" value="1" />
+        <option name="NX_BROADPHASE_COHERENT" value="2" />
+    </enum>
+
+    <enum name="NiSceneDescNxHwPipelineSpec" storage="uint">
+        <option name="NX_HW_RB_PIPELINE_HLP_ONLY" value="0" />
+        <option name="NX_HW_PIPELINE_FULL" value="1" />
+        <option name="NX_HW_PIPELINE_DEBUG" value="2" />
+    </enum>
+
+    <enum name="NiSceneDescNxHwSceneType" storage="uint">
+        <option name="NX_HW_SCENE_TYPE_RB" value="0" />
+        <option name="NX_HW_SCENE_TYPE_FLUID" value="1" />
+        <option name="NX_HW_SCENE_TYPE_FLUID_SOFTWARE" value="2" />
+        <option name="NX_HW_SCENE_TYPE_CLOTH" value="3" />
+    </enum>
+
+    <enum name="NxTimeStepMethod" storage="uint">
+        <option name="NX_TIMESTEP_FIXED" value="0" />
+        <option name="NX_TIMESTEP_VARIABLE" value="1" />
+    </enum>
+
+    <enum name="NxSimulationType" storage="uint">
+        <option name="NX_SIMULATION_SW" value="0" />
+        <option name="NX_SIMULATION_HW" value="1" />
+    </enum>
+
+    <enum name="NxBroadPhaseType" storage="uint">
+        <option name="NX_BP_TYPE_SAP_SINGLE" value="0" />
+        <option name="NX_BP_TYPE_SAP_MULTI" value="1" />
+    </enum>
+
+    <enum name="NxFilterOp" storage="uint">
+        <option name="NX_FILTEROP_AND" value="0" />
+        <option name="NX_FILTEROP_OR" value="1" />
+        <option name="NX_FILTEROP_XOR" value="2" />
+        <option name="NX_FILTEROP_NAND" value="3" />
+        <option name="NX_FILTEROP_NOR" value="4" />
+        <option name="NX_FILTEROP_NXOR" value="5" />
+        <option name="NX_FILTEROP_SWAP_AND" value="6" />
+    </enum>
+
+    <enum name="NxCompartmentType" storage="uint">
+        <option name="NX_SCT_RIGIDBODY" value="0" />
+        <option name="NX_SCT_FLUID" value="1" />
+        <option name="NX_SCT_CLOTH" value="2" />
+    </enum>
+
+    <compound name="PhysXSceneDescMaterial">
+        <add name="Key" type="ushort" />
+        <add name="Material" type="Ref" template="NiPhysXMaterialDesc" />
+    </compound>
+
+    <compound name="PhysXSceneDescCompartment">
+        <add name="ID" type="uint" />
+        <add name="Type" type="NxCompartmentType" />
+        <add name="Device Code" type="uint" />
+        <add name="Grid Hash Cell Size" type="float" />
+        <add name="Grid Hash Table Power" type="uint" />
+    </compound>
+
+    <niobject name="NiPhysXSceneDesc" inherit="NiObject">
+        Object which caches the properties of NxScene, stored as a snapshot in a NiPhysXScene.
+        <add name="Broad Phase Type" type="NiSceneDescNxBroadPhaseType" ver2="20.2.0.7" />
+        <add name="Gravity" type="Vector3" />
+        <add name="Max Timestep" type="float" />
+        <add name="Max Iterations" type="uint" />
+        <add name="Time Step Method" type="NxTimeStepMethod" />
+        <add name="Has Bound" type="bool" />
+        <add name="Max Bounds Min" type="Vector3" cond="Has Bound" />
+        <add name="Max Bounds Max" type="Vector3" cond="Has Bound" />
+        <add name="Has Limits" type="bool" />
+        <add name="Max Actors" type="uint" cond="Has Limits" />
+        <add name="Max Bodies" type="uint" cond="Has Limits" />
+        <add name="Max Static Shapes" type="uint" cond="Has Limits" />
+        <add name="Max Dynamic Shapes" type="uint" cond="Has Limits" />
+        <add name="Simulation Type" type="NxSimulationType" />
+        <add name="HW Scene Type" type="NiSceneDescNxHwSceneType" ver2="20.2.0.8" />
+        <add name="HW Pipeline Spec" type="NiSceneDescNxHwPipelineSpec" ver2="20.2.0.8" />
+        <add name="Ground Plane" type="bool" />
+        <add name="Bounds Plane" type="bool" />
+        <add name="Collision Detection" type="bool" ver2="20.2.0.7" />
+        <add name="Flags" type="uint" ver1="20.2.0.8" />
+        <add name="Internal Thread Count" type="uint" ver1="20.2.0.8" />
+        <add name="Background Thread Count" type="uint" ver1="20.2.0.8" />
+        <add name="Thread Mask" type="uint" ver1="20.2.0.8" />
+        <add name="Background Thread Priority" type="uint" ver1="20.5.0.3" />
+        <add name="Background Thread Mask" type="uint" ver1="20.2.0.8" />
+        <add name="Num HW Scenes" type="uint" ver1="20.3.0.1" ver2="20.3.0.5" />
+        <add name="Sim Thread Stack Size" type="uint" ver1="20.3.0.1" />
+        <add name="Sim Thread Priority" type="uint" ver1="20.3.0.1" />
+        <add name="Worker Thread Stack Size" type="uint" ver1="20.3.0.1" />
+        <add name="Worker Thread Priority" type="uint" ver1="20.3.0.1" />
+        <add name="Up Axis" type="uint" ver1="20.3.0.1" />
+        <add name="Subdivision Level" type="uint" ver1="20.3.0.1" />
+        <add name="Static Structure" type="uint" ver1="20.3.0.1" />
+        <add name="Dynamic Structure" type="uint" ver1="20.3.0.1" />
+        <add name="Dynamic Tree Rebuild Rate Hint" type="uint" ver1="20.5.0.3" />
+        <add name="Broad Phase Type" type="NxBroadPhaseType" ver1="20.4.0.0" />
+        <add name="Grid Cells X" type="uint" ver1="20.4.0.0" />
+        <add name="Grid Cells Y" type="uint" ver1="20.4.0.0" />
+        <add name="Num Actors" type="uint" ver2="20.3.0.1" />
+        <add name="Actors" type="Ref" template="NiPhysXActorDesc" arr1="Num Actors" ver2="20.3.0.1" />
+        <add name="Num Joints" type="uint" ver2="20.3.0.1" />
+        <add name="Joints" type="Ref" template="NiPhysXJointDesc" arr1="Num Joints" ver2="20.3.0.1" />
+        <add name="Num Materials" type="uint" ver2="20.3.0.1" />
+        <add name="Materials" type="PhysXSceneDescMaterial" arr1="Num Materials" ver2="20.3.0.1" />
+        <add name="Group Collision Flags" type="bool" arr1="1024" />
+        <add name="Filter Ops" type="NxFilterOp" arr1="3" />
+        <add name="Filter Constants" type="uint" arr1="8" />
+        <add name="Filter" type="bool" />
+        <add name="Num States" type="uint" ver2="20.3.0.1" />
+        <add name="Num Compartments" type="uint" ver1="20.3.0.6" />
+        <add name="Compartments" type="PhysXSceneDescCompartment" arr1="Num Compartments" ver1="20.3.0.6" />
+    </niobject>
+
     <niobject name="NiPhysXProp" inherit="NiObjectNET">
         A PhysX prop which holds information about PhysX actors in a Gamebryo scene
         <add name="PhysX to World Scale" type="float" />
         <add name="Num Sources" type="uint" />
-        <add name="Sources" type="Ref" template="NiObject" arr1="Num Sources" />
-        <add name="Num Dests" type="int" />
+        <add name="Sources" type="Ref" template="NiPhysXSrc" arr1="Num Sources" />
+        <add name="Num Dests" type="uint" />
         <add name="Dests" type="Ref" template="NiPhysXDest" arr1="Num Dests" />
         <add name="Num Modified Meshes" type="uint" ver1="20.4.0.0" />
         <add name="Modified Meshes" type="Ref" template="NiMesh" arr1="Num Modified Meshes" ver1="20.4.0.0" />
@@ -6863,6 +7003,46 @@
         <add name="Max to Spawn" type="uint" />
     </niobject>
 
+    <!-- NiPhysXPS -->
+
+    <niobject name="NiPhysXPSParticleSystem" inherit="NiPSParticleSystem">
+        Implements Gamebryo particle systems that use PhysX actors for the particles
+        <add name="Prop" type="Ptr" template="NiPhysXPSParticleSystemProp" />
+        <add name="Dest" type="Ptr" template="NiPhysXPSParticleSystemDest" />
+        <add name="Scene" type="Ptr" template="NiPhysXScene" />
+        <add name="Flags" type="byte" />
+        <add name="Default Actor Pool Size" type="uint" />
+        <add name="Generation Pool Size" type="uint" />
+        <add name="Actor Pool Center" type="Vector3" />
+        <add name="Actor Pool Dimensions" type="Vector3" />
+        <add name="Actor" type="Ptr" template="NiPhysXActorDesc" />
+    </niobject>
+
+    <niobject name="NiPhysXPSParticleSystemProp" inherit="NiPhysXProp">
+        A PhysX prop which holds information about a PhysX particle system prop.
+        <add name="Num Systems" type="uint" />
+        <add name="Systems" type="Ptr" template="NiPhysXPSParticleSystem" arr1="Num Systems" />
+    </niobject>
+
+    <niobject name="NiPhysXPSParticleSystemDest" inherit="NiPhysXDest">
+        An object which interfaces between the PhysX scene and the Gamebryo particle system.
+        <add name="Target" type="Ptr" template="NiPSParticleSystem" />
+    </niobject>
+
+    <niobject name="NiPhysXPSSimulator" inherit="NiPSSimulator">
+        Adds additional sync points to a NiPSSimulator mesh modifier.
+    </niobject>
+
+    <niobject name="NiPhysXPSSimulatorInitialStep" inherit="NiPSSimulatorStep">
+        Used to set the post-simulation state of particles in a physics-enabled particle system.
+    </niobject>
+
+    <niobject name="NiPhysXPSSimulatorFinalStep" inherit="NiPSSimulatorStep">
+        Used to push the results of the particle system update into the PhysX actors.
+    </niobject>
+
+    <!-- NiEvaluator -->
+
     <niobject name="NiEvaluator" abstract="1" inherit="NiObject">
         <add name="Node Name" type="string">The name of the animated NiAVObject.</add>
         <add name="Property Type" type="string">The RTTI type of the NiProperty the controller is attached to, if applicable.</add>

From 138594e3ac73c5ef0b96c62207cae39aac26fc0c Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 17 May 2018 05:57:06 -0400
Subject: [PATCH 06/86] NiPSCurveEmitter

---
 nif.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/nif.xml b/nif.xml
index 7c1a26e..4be3100 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1707,6 +1707,15 @@
         <add name="Radius" type="float">The sphere's radius.</add>
     </compound>
 
+    <compound name="NiCurve3">
+        A 3D curve made up of control points and knots.
+        <add name="Degree" type="uint" />
+        <add name="Num Control Points" type="uint" />
+        <add name="Control Points" type="Vector3" arr1="Num Control Points" />
+        <add name="Num Knots" type="uint" />
+        <add name="Knots" type="float" arr1="Num Knots" />
+    </compound>
+
     <compound name="NiQuatTransform">
         <add name="Translation" type="Vector3" />
         <add name="Rotation" type="Quaternion" />
@@ -6859,6 +6868,14 @@
         <add name="Initial Velocity Type" type="VelocityType" />
     </niobject>
 
+    <niobject name="NiPSCurveEmitter" inherit="NiPSEmitter">
+        Emits particles from a curve.
+        <add name="Has Curve" type="bool" />
+        <add name="Curve" type="NiCurve3" cond="Has Curve" />
+        <add name="Curve Parent" type="Ptr" template="NiAVObject" />
+        <add name="Emitter Object" type="Ptr" template="NiAVObject" />
+    </niobject>
+
     <!-- NiPS Controllers -->
 
     <niobject name="NiPSEmitterCtlr" abstract="1" inherit="NiSingleInterpController">

From be3ce677b3d870d4873f73cf56ad446c429ae59b Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 17 May 2018 06:32:33 -0400
Subject: [PATCH 07/86] Use NiBound where necessary

Several objects used separate center/radius when it's actually an NiBound object.  This was apparent with the addition of additional data to NiBound for custom 20.3.0.9 versions for Divinity 2.
---
 nif.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/nif.xml b/nif.xml
index 4be3100..268e5db 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1705,6 +1705,7 @@
         A sphere.
         <add name="Center" type="Vector3">The sphere's center.</add>
         <add name="Radius" type="float">The sphere's radius.</add>
+        <add name="Unknown 13 Shorts" type="short" arr1="13" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
     </compound>
 
     <compound name="NiCurve3">
@@ -1787,9 +1788,7 @@
     <compound name="BoneData">
         NiSkinData::BoneData. Skinning data component.
         <add name="Skin Transform" type="NiTransform">Offset of the skin from this bone in bind position.</add>
-        <add name="Bounding Sphere Offset" type="Vector3">Translation offset of a bounding sphere holding all vertices. (Note that its a Sphere Containing Axis Aligned Box not a minimum volume Sphere)</add>
-        <add name="Bounding Sphere Radius" type="float">Radius for bounding sphere holding all vertices.</add>
-        <add name="Unknown 13 Shorts" type="short" arr1="13" ver1="20.3.0.9" ver2="20.3.0.9" userver="131072">Unknown, always 0?</add>
+        <add name="Bounding Sphere" type="NiBound">Note that its a Sphere Containing Axis Aligned Box not a minimum volume Sphere</add>
         <add name="Num Vertices" type="ushort">Number of weighted vertices.</add>
         <add name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver2="4.2.1.0">The vertex weights.</add>
         <add name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver1="4.2.2.0" cond="ARG != 0">The vertex weights.</add>
@@ -3214,11 +3213,7 @@
         <add name="Normals" type="Vector3" arr1="Num Vertices" cond="Has Normals">The lighting normals.</add>
         <add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Tangent vectors.</add>
         <add name="Bitangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Bitangent vectors.</add>
-        <!-- TODO: NiBound -->
-        <add name="Center" type="Vector3">Center of the bounding box (smallest box that contains all vertices) of the mesh.</add>
-        <add name="Radius" type="float">Radius of the mesh: maximal Euclidean distance between the center and all vertices.</add>
-        <add name="Unknown 13 shorts" type="short" arr1="13" ver1="20.3.0.9" ver2="20.3.0.9" userver="131072">Unknown, always 0?</add>
-        <!-- / NiBound -->
+        <add name="Bounding Sphere" type="NiBound" />
         <add name="Has Vertex Colors" type="bool">
             Do we have vertex colors? These are usually used to fine-tune the lighting of the model.
 

From fcf42dbe16d7ef65164983a822b67525a24f2f37 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 17 May 2018 06:40:52 -0400
Subject: [PATCH 08/86] Fixes for 20.3.0.9 custom versions

Only MdlManBinary.nif cannot be read for Divinity 2, and it appears to be some kind of rig filled with custom classes serialized to NIF.  There is no desire to decode this single NIF with 10 custom classes.

Also the Divinity 2 XML files that have a Gamebryo header are ignored as they appear to just contain XML strings in more custom classes.
---
 nif.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/nif.xml b/nif.xml
index 268e5db..03546aa 100644
--- a/nif.xml
+++ b/nif.xml
@@ -3106,8 +3106,8 @@
         <add name="Num Shape Groups 2" type="uint"  ver1="10.2.0.0" ver2="10.2.0.0" userver="1">The size of the second list of shape groups.</add>
         <add name="Shape Groups 2" type="Ref" template="NiTriBasedGeom" arr1="Num Shape Groups 2"  ver1="4.2.2.0" userver="0">Group of NiTriShape indices.</add>
         <add name="Shape Groups 2" type="Ref" template="NiTriBasedGeom" arr1="Num Shape Groups 2"  ver1="10.2.0.0" ver2="10.2.0.0" userver="1">Group of NiTriShape indices.</add>
-        <add name="Unknown Int 2" type="int" ver1="20.3.0.9" ver2="20.3.0.9" userver="131072">Unknown.</add>
-        <add name="Unknown Int 3" type="int" ver1="20.3.0.9" ver2="20.3.0.9" userver="131072">Unknown.</add>
+        <add name="Unknown Int 2" type="int" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)">Unknown.</add>
+        <add name="Unknown Int 3" type="int" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)">Unknown.</add>
     </niobject>
 
     <niobject name="NiBSBoneLODController" inherit="NiBoneLODController">
@@ -3213,6 +3213,8 @@
         <add name="Normals" type="Vector3" arr1="Num Vertices" cond="Has Normals">The lighting normals.</add>
         <add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Tangent vectors.</add>
         <add name="Bitangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Bitangent vectors.</add>
+        <add name="Has Unk Floats" type="bool" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
+        <add name="Unk Floats" type="float" arr1="Num Vertices" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" cond="Has Unk Floats" />
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Has Vertex Colors" type="bool">
             Do we have vertex colors? These are usually used to fine-tune the lighting of the model.
@@ -3552,8 +3554,9 @@
         <add name="Name" type="string">The sequence name by which the animation system finds and manages this sequence.</add>
         <add name="Accum Root Name" type="string" ver2="10.1.0.103">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
         <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver2="10.1.0.103" />
-        <add name="Unknown Int 4" type="int" ver1="20.3.0.9" ver2="20.3.0.9" userver="131072">Divinity 2</add>
-        <add name="Unknown Int 5" type="int" ver1="20.3.0.9" ver2="20.3.0.9" userver="131072">Divinity 2</add>
+        <add name="Num Unknown Ints" type="int" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)">Divinity 2</add>
+        <add name="Unknown Ints" type="int" arr1="Num Unknown Ints" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)">Divinity 2</add>
+        <add name="Unknown Ref" type="Ref" template="NiObject" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)">Divinity 2</add>
         <add name="Num Controlled Blocks" type="uint" />
         <add name="Array Grow By" type="uint" ver1="10.1.0.106" />
         <add name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" />
@@ -7238,10 +7241,13 @@
         <add name="Bones 2" type="Ptr" template="NiNode" arr1="Num Bones 2">List of all armature bones.</add>
     </niobject>
 
-    <!-- Divinity 2 (P_Island_VerySmall_A.item) -->
+    <!-- Divinity 2 -->
     <niobject name="CStreamableAssetData" inherit="NiObject">
         <add name="Root" type="Ref" template="NiNode" />
-        <add name="Unknown Bytes" type="byte" arr1="5" />
+        <add name="Has Data" type="bool" />
+        <add name="Data" type="ByteArray" cond="Has Data" />
+        <add name="Num Refs" type="uint" />
+        <add name="Refs" type="Ref" template="NiObject" arr1="Num Refs" />
     </niobject>
 
     <!-- Skyrim specific havok block -->

From ed01a5b822fc8905bf13301b76c28229b3fadac4 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 17 May 2018 06:45:58 -0400
Subject: [PATCH 09/86] "union" can be a reserved keyword

In C++ and other langs, this compound member gets generated to "union" which clashes with the reserved keyword.
---
 nif.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nif.xml b/nif.xml
index 03546aa..8ca31fc 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2058,7 +2058,7 @@
         <add name="Sphere" type="NiBound" cond="Collision Type == 0" />
         <add name="Box" type="BoxBV" cond="Collision Type == 1" />
         <add name="Capsule" type="CapsuleBV" cond="Collision Type == 2" />
-        <add name="Union" type="UnionBV" cond="Collision Type == 4" />
+        <add name="Union BV" type="UnionBV" cond="Collision Type == 4" />
         <add name="Half Space" type="HalfSpaceBV" cond="Collision Type == 5" />
     </compound>
 

From af2a5b8b8faebe3e8f36a7f4b5c3b2be61193b5f Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 17 May 2018 06:52:35 -0400
Subject: [PATCH 10/86] Fixes for 10.2.0.1/10.3.0.1/10.4.0.1 custom versions

Enhanced support for WorldShift.

In order to not complicate the objects, I fudged the official version conditions slightly to accommodate 10.4.0.1 given that no official versions exist between 10.2 and 20.0.

Aside from the new custom block, only modified the conditions that were already there.
---
 nif.xml | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/nif.xml b/nif.xml
index 8ca31fc..54348a0 100644
--- a/nif.xml
+++ b/nif.xml
@@ -3124,7 +3124,7 @@
         <add name="Active Material" type="int" default="-1" ver1="20.2.0.5">The index of the currently active material.</add>
         <!-- Custom Versions -->
         <add name="Unknown Byte" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" userver="1">Cyanide extension (only in version 10.2.0.0?).</add>
-        <add name="Unknown Integer 2" type="int" ver1="10.4.0.1" ver2="10.4.0.1">Unknown.</add>
+        <add name="Unknown Integer 2" type="int" ver1="10.3.0.1" ver2="10.4.0.1">Unknown.</add>
         <!-- / Custom -->
         <add name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</add>
     </compound>
@@ -3985,25 +3985,26 @@
     -->
     <niobject name="NiPixelFormat" abstract="1" inherit="NiObject">
         <add name="Pixel Format" type="PixelFormat">The format of the pixels in this internally stored image.</add>
-        <add name="Red Mask" type="uint" ver2="10.3.0.2">0x000000ff (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</add>
-        <add name="Green Mask" type="uint" ver2="10.3.0.2">0x0000ff00 (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</add>
-        <add name="Blue Mask" type="uint" ver2="10.3.0.2">0x00ff0000 (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</add>
-        <add name="Alpha Mask" type="uint" ver2="10.3.0.2">0xff000000 (for 32bpp) or 0x00000000 (for 24bpp and 8bpp)</add>
-        <add name="Bits Per Pixel" type="uint" ver2="10.3.0.2">Bits per pixel, 0 (Compressed), 8, 24 or 32.</add>
-        <add name="Old Fast Compare" type="byte" arr1="8" ver2="10.3.0.2">
+        <!-- Technically since 10.3.0.3, fudging for WorldShift custom version as no games have official 10.3 NIFs anyway. -->
+        <add name="Red Mask" type="uint" ver2="10.4.0.1">0x000000ff (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</add>
+        <add name="Green Mask" type="uint" ver2="10.4.0.1">0x0000ff00 (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</add>
+        <add name="Blue Mask" type="uint" ver2="10.4.0.1">0x00ff0000 (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</add>
+        <add name="Alpha Mask" type="uint" ver2="10.4.0.1">0xff000000 (for 32bpp) or 0x00000000 (for 24bpp and 8bpp)</add>
+        <add name="Bits Per Pixel" type="uint" ver2="10.4.0.1">Bits per pixel, 0 (Compressed), 8, 24 or 32.</add>
+        <add name="Old Fast Compare" type="byte" arr1="8" ver2="10.4.0.1">
             [96,8,130,0,0,65,0,0] if 24 bits per pixel
             [129,8,130,32,0,65,12,0] if 32 bits per pixel
             [34,0,0,0,0,0,0,0] if 8 bits per pixel
             [X,0,0,0,0,0,0,0] if 0 (Compressed) bits per pixel where X = PixelFormat
         </add>
-        <add name="Tiling" type="PixelTiling" ver1="10.1.0.0" ver2="10.3.0.2">Seems to always be zero.</add>
-        <add name="Bits Per Pixel" type="byte" ver1="10.3.0.3">Bits per pixel, 0 (Compressed), 8, 24 or 32.</add>
-        <add name="Renderer Hint" type="uint" ver1="10.3.0.3" />
-        <add name="Extra Data" type="uint" ver1="10.3.0.3" />
-        <add name="Flags" type="byte" ver1="10.3.0.3" />
-        <add name="Tiling" type="PixelTiling" ver1="10.3.0.3" />
+        <add name="Tiling" type="PixelTiling" ver1="10.1.0.0" ver2="10.4.0.1">Seems to always be zero.</add>
+        <add name="Bits Per Pixel" type="byte" ver1="10.4.0.2">Bits per pixel, 0 (Compressed), 8, 24 or 32.</add>
+        <add name="Renderer Hint" type="uint" ver1="10.4.0.2" />
+        <add name="Extra Data" type="uint" ver1="10.4.0.2" />
+        <add name="Flags" type="byte" ver1="10.4.0.2" />
+        <add name="Tiling" type="PixelTiling" ver1="10.4.0.2" />
         <add name="sRGB Space" type="bool" ver1="20.3.0.4" />
-        <add name="Channels" type="PixelFormatComponent" arr1="4" ver1="10.3.0.3">Channel Data</add>
+        <add name="Channels" type="PixelFormatComponent" arr1="4" ver1="10.4.0.2">Channel Data</add>
     </niobject>
 
     <niobject name="NiPersistentSrcTextureRendererData" inherit="NiPixelFormat">
@@ -4026,9 +4027,10 @@
         <add name="Bytes Per Pixel" type="uint" />
         <add name="Mipmaps" type="MipMap" arr1="Num Mipmaps" />
         <add name="Num Pixels" type="uint" />
-        <add name="Num Faces" type="uint" ver1="10.3.0.6" default="1" />
-        <add name="Pixel Data" type="byte" binary="1" arr1="Num Pixels" ver2="10.3.0.5" />
-        <add name="Pixel Data" type="byte" binary="1" arr1="Num Pixels * Num Faces" ver1="10.3.0.6" />
+        <!-- Technically since 10.3.0.6, fudging for WorldShift custom version as no games have official 10.3 NIFs anyway. -->
+        <add name="Num Faces" type="uint" ver1="10.4.0.2" default="1" />
+        <add name="Pixel Data" type="byte" binary="1" arr1="Num Pixels" ver2="10.4.0.1" />
+        <add name="Pixel Data" type="byte" binary="1" arr1="Num Pixels * Num Faces" ver1="10.4.0.2" />
     </niobject>
 
     <niobject name="NiPlanarCollider" inherit="NiParticleModifier">
@@ -4237,13 +4239,20 @@
         <add name="Percentage Spawned" type="float" default="1.0">The likelihood of a particular particle being spawned. Must be between 0.0 and 1.0.</add>
         <add name="Min Num to Spawn" type="ushort" default="1">The minimum particles to spawn for any given original particle.</add>
         <add name="Max Num to Spawn" type="ushort" default="1">The maximum particles to spawn for any given original particle.</add>
-        <add name="Unknown Int" type="int" ver1="10.4.0.1" ver2="10.4.0.1">WorldShift</add>
+        <add name="Unknown Int" type="int" ver1="10.2.0.1" ver2="10.4.0.1">WorldShift</add>
         <add name="Spawn Speed Variation" type="float">How much the spawned particle speed can vary.</add>
         <add name="Spawn Dir Variation" type="float">How much the spawned particle direction can vary.</add>
         <add name="Life Span" type="float">Lifespan assigned to spawned particles.</add>
         <add name="Life Span Variation" type="float">The amount the lifespan can vary.</add>
     </niobject>
 
+    <!-- WorldShift -->
+    <niobject name="NiPSysPartSpawnModifier" inherit="NiPSysModifier">
+        <add name="Unk Float 1" type="float" />
+        <add name="Unk Float 2" type="float" />
+        <add name="Spawner" type="Ref" template="NiPSysSpawnModifier" />
+    </niobject>
+
     <niobject name="NiPSysSphereEmitter" inherit="NiPSysVolumeEmitter">
         Particle emitter that uses points within a sphere shape to emit from.
         <add name="Radius" type="float" />

From eb4dfe6854e0af5a8fc67aa548937b7e8026e413 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 18 May 2018 03:00:16 -0400
Subject: [PATCH 11/86] Initial implementation for #69

Made `<version>` mean distinct combination of header values which produce identical block layouts.  This meant splitting up several main Versions into many based on User Version or Bethesda  Version.

id = Used to uniquely identify this collection of NIF versions. Can also be used for enum generation, map/dictionary keys.

user = List of User Versions which are functionally equivalent

bsver = List of Bethesda Versions which are functionally equivalent

custom = If user/bsver are default but the Version is actually specific to a developer and not an official Gamebryo version

supported = Whether or not the XML fully supports reading/writing of this version.

ext = List of custom file extensions associated with this version.
---
 nif.xml | 118 +++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 75 insertions(+), 43 deletions(-)

diff --git a/nif.xml b/nif.xml
index 54348a0..253ed08 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1,49 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE niftoolsxml>
 <niftoolsxml version="0.9.1.0">
-    <!--These are the version numbers marked as supported by NifSkope.
-        The num argument is the numeric representation created by storing
-        each part of the version in a byte.  For example, 4.0.0.2 is
-        0x04000002 and 10.1.0.0 is 0x0A010000.-->
-
-    <version num="2.3">Dark Age of Camelot</version>
-    <version num="3.0">Star Trek: Bridge Commander</version>
-    <version num="3.03">Dark Age of Camelot</version>
-    <version num="3.1">Dark Age of Camelot, Star Trek: Bridge Commander</version>
-    <version num="3.3.0.13">Oblivion</version>
-    <version num="4.0.0.0">Freedom Force</version>
-    <version num="4.0.0.2">Morrowind, Freedom Force</version>
-    <version num="4.1.0.12">Dark Age of Camelot</version>
-    <version num="4.2.0.2">Civilization IV</version>
-    <version num="4.2.1.0">Dark Age of Camelot, Civilization IV</version>
-    <version num="4.2.2.0">Dark Age of Camelot, Civilization IV, Empire Earth II, Culpa Innata</version>
-    <version num="10.0.1.0">Zoo Tycoon 2, Civilization IV, Oblivion</version>
-    <version num="10.0.1.2">Oblivion</version>
-    <version num="10.0.1.3">?</version>
-    <version num="10.1.0.0">Dark Age of Camelot, Civilization IV, Freedom Force vs. the 3rd Reich, Axis and Allies, Kohan 2, Entropia Universe, Wildlife Park 2, The Guild 2, NeoSteam, Empire Earth II</version>
-    <version num="10.1.0.101">Oblivion</version>
-    <version num="10.1.0.106">Oblivion</version>
-    <version num="10.2.0.0">Civilization IV, Oblivion, Loki, Pro Cycling Manager, Prison Tycoon, Red Ocean, Wildlife Park 2</version>
-    <version num="10.2.0.1">Worldshift</version>
-    <version num="10.4.0.1">Worldshift</version>
-    <version num="20.0.0.4">Civilization IV, Oblivion, Sid Meier's Railroads</version>
-    <version num="20.0.0.5">Oblivion</version>
-    <version num="20.1.0.3">Megami Tensei: Imagine</version>
-    <version num="20.2.0.7">Emerge, Empire Earth III, Fallout 3, Skyrim, Fallout 4</version>
-    <version num="20.2.0.8">Emerge, Empire Earth III, Atlantica</version>
-    <!-- version 20.3.0.1 is found in Props/GDCLargeContainer.nif-->
-    <version num="20.3.0.1">Emerge</version>
-    <!-- version 20.3.0.2 is found in PFX/fx_muzzle_flash_example.nif -->
-    <version num="20.3.0.2">Emerge</version>
-    <version num="20.3.0.3">Emerge</version>
-    <version num="20.3.0.6">Emerge</version>
-    <version num="20.3.0.9">Warhammer, Lazeska, Divinity 2, Howling Sword, Bully SE</version>
-    <version num="20.5.0.0">KrazyRain</version>
-    <version num="20.6.0.0">KrazyRain</version>
-    <version num="20.6.5.0">Epic Mickey</version>
-    <version num="30.0.0.2">Emerge</version>
-    <version num="30.1.0.3">Rocksmith, Rocksmith 2014</version>
-    <version num="30.2.0.3">Ghost In The Shell: First Assault, MapleStory 2</version>
+    <!-- The versions found in use by the engine which have any amount of decoding or support from nif.xml
+            NOTE: Hypothetical versions such as those used in version conditions must NOT receive version tags.
+    
+        id = "VX_X_X_X": The unique identifier for this version. Can be used to generate C-style enums, etc.
+        num = "X.X.X.X": The numeric representation created by storing each part of the version in a byte.
+            Example:  4.0.0.2 == 0x04000002
+                     10.1.0.0 == 0x0A010000.
+        supported = "<boolean>": False if the XML does not fully support reading of this version.
+        user = "<List[integer]>": The custom User Version(s) for a specific Version from a game/developer.
+            Note: Grouping multiple user in a list means that these user produce identical NIF layout.
+            Example: user="12"
+                     user="0x20000 0x30000"
+        bsver = "<List[integer]>": The custom Bethesda Version(s) for a specific Version and User Version.
+            Note: Grouping multiple bsver in a list means that these bsver produce identical NIF layout.
+            Example: bsver="34"
+                     bsver="30 31 32 33"
+        custom = "<boolean>": True when version contains extensions to the format not originating from Gamebryo.
+            Note: A user or bsver of non-zero implies custom="true" and is not necessary.
+        ext = "<List[string]>": Any custom NIF extensions associated with this version.
+            Example: ext="bto btr"
+    -->
+
+    <version id="V2_3" num="2.3" supported="false">Dark Age of Camelot</version>
+    <version id="V3_0" num="3.0" supported="false">Star Trek: Bridge Commander</version>
+    <version id="V3_03" num="3.03" supported="false">Dark Age of Camelot</version>
+    <version id="V3_1" num="3.1" supported="false">Dark Age of Camelot, Star Trek: Bridge Commander</version>
+    <version id="V3_3_0_13" num="3.3.0.13">Oblivion, Munch's Oddysee</version>
+    <version id="V4_0_0_0" num="4.0.0.0">Freedom Force</version>
+    <version id="V4_0_0_2" num="4.0.0.2">Morrowind, Freedom Force</version>
+    <version id="V4_1_0_12" num="4.1.0.12">Dark Age of Camelot</version>
+    <version id="V4_2_0_2" num="4.2.0.2">Civilization IV</version>
+    <version id="V4_2_1_0" num="4.2.1.0">Dark Age of Camelot, Civilization IV</version>
+    <version id="V4_2_2_0" num="4.2.2.0">Dark Age of Camelot, Civilization IV, Empire Earth II, Culpa Innata</version>
+    <version id="V10_0_1_0" num="10.0.1.0">Zoo Tycoon 2, Civilization IV, Oblivion</version>
+    <version id="V10_0_1_2" num="10.0.1.2" bsver="1 3">Oblivion</version>
+    <version id="V10_1_0_0" num="10.1.0.0">Dark Age of Camelot, Civilization IV, Freedom Force vs. the 3rd Reich, Axis and Allies, Kohan 2, Wildlife Park 2, The Guild 2, NeoSteam, Empire Earth II</version>
+    <version id="V10_1_0_101" num="10.1.0.101" user="10" bsver="4">Oblivion</version>
+    <version id="V10_1_0_106" num="10.1.0.106" user="10" bsver="5">Oblivion</version>
+    <version id="V10_2_0_0" num="10.2.0.0" user="0">Civilization IV, Loki, Pro Cycling Manager, Prison Tycoon, Red Ocean, Wildlife Park 2</version>
+    <version id="V10_2_0_0__10" num="10.2.0.0" user="10" bsver="6 7 8 9">Oblivion</version>
+    <version id="V10_2_0_1" num="10.2.0.1" custom="true">Worldshift</version>
+    <version id="V10_3_0_1" num="10.3.0.1" custom="true">Worldshift</version>
+    <version id="V10_4_0_1" num="10.4.0.1" custom="true">Worldshift</version>
+    <version id="V20_0_0_4" num="20.0.0.4" user="0">Civilization IV, Sid Meier's Railroads, Florensia, Ragnarok Online 2, IRIS Online</version>
+    <version id="V20_0_0_4__10" num="20.0.0.4" user="10" bsver="11">Oblivion</version>
+    <version id="V20_0_0_4__11" num="20.0.0.4" user="11" bsver="11">Fallout 3 (few KF files, used, 1 NIF file, unused?)</version>
+    <version id="V20_0_0_5_OBL" num="20.0.0.5" user="10" bsver="11">Oblivion</version>
+    <version id="V20_1_0_3" num="20.1.0.3">Shin Megami Tensei: Imagine</version>
+    <version id="V20_2_0_7" num="20.2.0.7" user="0">Empire Earth III, Atlantica Online, Florensia, IRIS Online, Wizard101</version>
+    <version id="V20_2_0_7__11_1" num="20.2.0.7" user="11" bsver="14">Fallout 3, Fallout NV</version>
+    <version id="V20_2_0_7__11_2" num="20.2.0.7" user="11" bsver="16" ext="rdt">Fallout 3</version>
+    <version id="V20_2_0_7__11_3" num="20.2.0.7" user="11" bsver="21">Fallout 3, Fallout NV</version>
+    <version id="V20_2_0_7__11_4" num="20.2.0.7" user="11" bsver="24">Fallout 3, Fallout NV</version>
+    <version id="V20_2_0_7__11_5" num="20.2.0.7" user="11" bsver="25">Fallout 3, Fallout NV</version>
+    <version id="V20_2_0_7__11_6" num="20.2.0.7" user="11" bsver="26">Fallout 3, Fallout NV</version>
+    <version id="V20_2_0_7__11_7" num="20.2.0.7" user="11" bsver="27 28">Fallout 3, Fallout NV</version>
+    <version id="V20_2_0_7__11_8" num="20.2.0.7" user="11" bsver="30 31 32 33">Fallout 3, Fallout NV</version>
+    <version id="V20_2_0_7_FO3" num="20.2.0.7" user="11" bsver="34" ext="rdt">Fallout 3, Fallout NV</version>
+    <version id="V20_2_0_7_SKY" num="20.2.0.7" user="12" bsver="83" ext="bto btr">Skyrim</version>
+    <version id="V20_2_0_7_SSE" num="20.2.0.7" user="12" bsver="100" ext="bto btr">Skyrim SE</version>
+    <version id="V20_2_0_7_FO4" num="20.2.0.7" user="12" bsver="130" ext="bto btr">Fallout 4</version>
+    <version id="V20_2_0_8" num="20.2.0.8" ext="nifcache">Empire Earth III, Atlantica Online, FFT Online, IRIS Online, Wizard101</version>
+    <version id="V20_3_0_1" num="20.3.0.1">Emerge</version>
+    <version id="V20_3_0_2" num="20.3.0.2">Emerge</version>
+    <version id="V20_3_0_3" num="20.3.0.3">Emerge</version>
+    <version id="V20_3_0_6" num="20.3.0.6">Emerge</version>
+    <version id="V20_3_0_9" num="20.3.0.9" user="0 0x10000" ext="nft item">Warhammer, Lazeska, Howling Sword, Bully SE, Divinity 2 (0x10000)</version>
+    <version id="V20_3_0_9_DIV2" num="20.3.0.9" user="0x20000 0x30000" ext="item">Divinity 2</version>
+    <version id="V20_5_0_0" num="20.5.0.0">MicroVolts, KrazyRain</version>
+    <version id="V20_6_0_0" num="20.6.0.0">MicroVolts, KrazyRain, Ragnarok Online 2, Atlantica Online, IRIS Online, Wizard101</version>
+    <version id="V20_6_5_0_DEM" num="20.6.5.0" user="17" supported="false">Epic Mickey 2</version>
+    <version id="V30_0_0_2" num="30.0.0.2">Emerge</version>
+    <version id="V30_1_0_1" num="30.1.0.1">Emerge</version>
+    <version id="V30_1_0_3" num="30.1.0.3">Rocksmith, Rocksmith 2014</version>
+    <version id="V30_2_0_3" num="30.2.0.3">Ghost In The Shell: First Assault, MapleStory 2</version>
 
     <!--Basic Types-->
 

From cfe82da431332cdb6038aa0c173deff8f70ed2fc Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 18 May 2018 10:55:32 -0400
Subject: [PATCH 12/86] Correct NiBoneLODController

The attempt here was to exclude Bethesda from several rows on NiBoneLODController, since in the XML it inherits from NiBoneLODController for its own custom block that does not have those rows.  The reasoning is actually that it does *not* inherit from NiBoneLODController in the engine,  but the inheritance will stay fudged here for now.
---
 nif.xml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/nif.xml b/nif.xml
index 253ed08..e0879bc 100644
--- a/nif.xml
+++ b/nif.xml
@@ -3130,16 +3130,10 @@
         <add name="Num LODs" type="uint">Number of LODs.</add>
         <add name="Num Node Groups" type="uint">Number of node arrays.</add>
         <add name="Node Groups" type="NodeSet" arr1="Num LODs">A list of node sets (each set a sequence of bones).</add>
-        <add name="Num Shape Groups" type="uint" ver1="4.2.2.0" userver="0">Number of shape groups.</add>
-        <add name="Num Shape Groups" type="uint" ver1="10.2.0.0" ver2="10.2.0.0" userver="1">Number of shape groups.</add>
-        <add name="Shape Groups 1" type="SkinInfoSet" arr1="Num Shape Groups"  ver1="4.2.2.0" userver="0">List of shape groups.</add>
-        <add name="Shape Groups 1" type="SkinInfoSet" arr1="Num Shape Groups"  ver1="10.2.0.0" ver2="10.2.0.0" userver="1">List of shape groups.</add>
-        <add name="Num Shape Groups 2" type="uint"  ver1="4.2.2.0" userver="0">The size of the second list of shape groups.</add>
-        <add name="Num Shape Groups 2" type="uint"  ver1="10.2.0.0" ver2="10.2.0.0" userver="1">The size of the second list of shape groups.</add>
-        <add name="Shape Groups 2" type="Ref" template="NiTriBasedGeom" arr1="Num Shape Groups 2"  ver1="4.2.2.0" userver="0">Group of NiTriShape indices.</add>
-        <add name="Shape Groups 2" type="Ref" template="NiTriBasedGeom" arr1="Num Shape Groups 2"  ver1="10.2.0.0" ver2="10.2.0.0" userver="1">Group of NiTriShape indices.</add>
-        <add name="Unknown Int 2" type="int" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)">Unknown.</add>
-        <add name="Unknown Int 3" type="int" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)">Unknown.</add>
+        <add name="Num Shape Groups" type="uint" ver1="4.2.2.0" vercond="(User Version 2 == 0)">Number of shape groups.</add>
+        <add name="Shape Groups 1" type="SkinInfoSet" arr1="Num Shape Groups" ver1="4.2.2.0" vercond="(User Version 2 == 0)">List of shape groups.</add>
+        <add name="Num Shape Groups 2" type="uint" ver1="4.2.2.0" vercond="(User Version 2 == 0)">The size of the second list of shape groups.</add>
+        <add name="Shape Groups 2" type="Ref" template="NiTriBasedGeom" arr1="Num Shape Groups 2" ver1="4.2.2.0" vercond="(User Version 2 == 0)">Group of NiTriShape indices.</add>
     </niobject>
 
     <niobject name="NiBSBoneLODController" inherit="NiBoneLODController">

From 3268ab6b89cec7eace99e725b83beddc1a5f297b Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 18 May 2018 13:41:22 -0400
Subject: [PATCH 13/86] Invalid member name fixes

Formalization of what makes type and member name strings valid requires the removal of non-alphanumerics with the exception of the colon.
---
 nif.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nif.xml b/nif.xml
index e0879bc..fc02fb1 100644
--- a/nif.xml
+++ b/nif.xml
@@ -3791,7 +3791,7 @@
     <niobject name="FxRadioButton" inherit="FxWidget">
         Unknown.
         <add name="Unknown Int 1" type="uint">Unknown.</add>
-        <add name="Unknown Int  2" type="uint">Unknown.</add>
+        <add name="Unknown Int 2" type="uint">Unknown.</add>
         <add name="Unknown Int 3" type="uint">Unknown.</add>
         <add name="Num Buttons" type="uint">Number of unknown links.</add>
         <add name="Buttons" type="Ptr" template="FxRadioButton" arr1="Num Buttons">Unknown pointers to other buttons.  Maybe other buttons in a group so they can be switch off if this one is switched on?</add>
@@ -3942,8 +3942,8 @@
         <add name="Vertical Angle" type="float">emitter's vertical opening angle [radians]</add>
         <add name="Horizontal Direction" type="float">horizontal emit direction</add>
         <add name="Horizontal Angle" type="float">emitter's horizontal opening angle</add>
-        <add name="Unknown Normal?" type="Vector3">Unknown.</add>
-        <add name="Unknown Color?" type="Color4">Unknown.</add>
+        <add name="Unknown Normal" type="Vector3">Unknown.</add>
+        <add name="Unknown Color" type="Color4">Unknown.</add>
         <add name="Size" type="float">Particle size</add>
         <add name="Emit Start Time" type="float">Particle emit start time</add>
         <add name="Emit Stop Time" type="float">Particle emit stop time</add>
@@ -3955,11 +3955,11 @@
         <add name="Emit Flags" type="ushort" ver1="4.0.0.2">Bit 0: Emit Rate toggle bit (0 = auto adjust, 1 = use Emit Rate value)</add>
         <add name="Start Random" type="Vector3">Particle random start translation vector</add>
         <add name="Emitter" type="Ptr" template="NiObject">This index targets the particle emitter object (TODO: find out what type of object this refers to).</add>
-        <add name="Unknown Short 2?" type="ushort" ver1="4.0.0.2">? short=0 ?</add>
-        <add name="Unknown Float 13?" type="float" ver1="4.0.0.2">? float=1.0 ?</add>
-        <add name="Unknown Int 1?" type="uint" ver1="4.0.0.2">? int=1 ?</add>
-        <add name="Unknown Int 2?" type="uint" ver1="4.0.0.2">? int=0 ?</add>
-        <add name="Unknown Short 3?" type="ushort" ver1="4.0.0.2">? short=0 ?</add>
+        <add name="Unknown Short 2" type="ushort" ver1="4.0.0.2">? short=0 ?</add>
+        <add name="Unknown Float 13" type="float" ver1="4.0.0.2">? float=1.0 ?</add>
+        <add name="Unknown Int 1" type="uint" ver1="4.0.0.2">? int=1 ?</add>
+        <add name="Unknown Int 2" type="uint" ver1="4.0.0.2">? int=0 ?</add>
+        <add name="Unknown Short 3" type="ushort" ver1="4.0.0.2">? short=0 ?</add>
         <!-- <add name="Particle" type="Particle" ver2="3.1">The particle (older NIF versions only have a single particle per controller?)</add> -->
         <add name="Particle Velocity" type="Vector3" ver2="3.1">Particle velocity</add>
         <add name="Particle Unknown Vector" type="Vector3" ver2="3.1">Unknown</add>
@@ -5230,7 +5230,7 @@
         <add name="Mass" type="float" />
         <add name="Skin Width" type="float" />
         <add name="Shape Name" type="string" />
-        <add name="Non-Interacting Compartment Types" type="uint" ver1="20.4.0.0" />
+        <add name="Non Interacting Compartment Types" type="uint" ver1="20.4.0.0" />
         <add name="Collision Bits" type="uint" arr1="4" />
         <add name="Plane" type="NxPlane" cond="Shape Type == 0" />
         <add name="Sphere Radius" type="float" cond="Shape Type == 1" />
@@ -5407,8 +5407,8 @@
     <niobject name="BoundingBoxExtraData" inherit="NiExtraData">
         Red Ocean Bounding Box
         <add name="Flags" type="Flags">Unknown</add>
-        <add name="Center?" type="Vector3">Center of box?</add>
-        <add name="Extent?" type="Vector3">Extents of box?</add>
+        <add name="Center" type="Vector3">Center of box?</add>
+        <add name="Extent" type="Vector3">Extents of box?</add>
     </niobject>
     
     <niobject name="Door" inherit="Object">
@@ -6634,7 +6634,7 @@
         <add name="Living Spawner" type="Ref" template="NiPSSpawner" ver1="20.6.1.0" />
         <add name="Num Spawn Rate Keys" type="byte" ver1="20.6.1.0" />
         <add name="Spawn Rate Keys" type="PSSpawnRateKey" arr1="Num Spawn Rate Keys" ver1="20.6.1.0" />
-        <add name="Pre-RPI" type="bool" ver1="20.6.1.0" />
+        <add name="Pre RPI" type="bool" ver1="20.6.1.0" />
     </niobject>
 
     <niobject name="NiPSMeshParticleSystem" inherit="NiPSParticleSystem">
@@ -6642,7 +6642,7 @@
         <add name="Num Generations" type="uint" />
         <add name="Master Particles" type="Ref" template="NiAVObject" arr1="Num Generations" />
         <add name="Pool Size" type="uint" />
-        <add name="Auto-Fill Pools" type="bool" />
+        <add name="Auto Fill Pools" type="bool" />
     </niobject>
 
     <!-- NiPS Generators -->

From 2f1101f3a6aaac7f3b05fc868ba490c09eba9d3f Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sun, 27 May 2018 10:37:12 -0400
Subject: [PATCH 14/86] Simplifying BSVertexData conds

They were kept separate for clarity in actual code using the enumerations; clarity that doesn't transfer over to XML which is using the raw integers.

```
(A & X) != 0 && (A & Y) != 0 && (A & Z) == 0
```
Is the same as
```
(A & (X|Y|Z)) == (X|Y)
```
Basically != 0 you want that particular bit on the RHS of the expression, and == 0 you do not.
Anything tested you put on the LHS.

Also switched the order of HalfVector3/Vector3 as the larger type should come first.
---
 nif.xml | 58 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/nif.xml b/nif.xml
index fc02fb1..3ffb88c 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1636,38 +1636,38 @@
 	</bitflags>
     
 	<compound name="BSVertexData">
-		<add name="Vertex" type="HalfVector3" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
-		<add name="Bitangent X" type="hfloat" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) != 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
-		<add name="Unknown Short" type="ushort" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) == 0) &amp;&amp; ((ARG &amp; 16384) == 0)" />
-		
-		<add name="Vertex" type="Vector3" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
-		<add name="Bitangent X" type="float" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) != 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
-		<add name="Unknown Int" type="uint" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) == 0) &amp;&amp; ((ARG &amp; 16384) != 0)" />
-		
-		<add name="UV" type="HalfTexCoord" cond="((ARG &amp; 32) != 0)" />
-		<add name="Normal" type="ByteVector3" cond="(ARG &amp; 128) != 0" />
-		<add name="Bitangent Y" type="byte" cond="(ARG &amp; 128) != 0" />
-		<add name="Tangent" type="ByteVector3" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
-		<add name="Bitangent Z" type="byte" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
-		<add name="Vertex Colors" type="ByteColor4" cond="(ARG &amp; 512) != 0" />
-		<add name="Bone Weights" type="hfloat" arr1="4" cond="(ARG &amp; 1024) != 0" />
-		<add name="Bone Indices" type="byte" arr1="4" cond="(ARG &amp; 1024) != 0" />
-		<add name="Eye Data" type="float" cond="(ARG &amp; 4096) != 0" />
+		<add name="Vertex" type="Vector3" cond="(ARG &amp; 0x4010) == 0x4010" />
+		<add name="Bitangent X" type="float" cond="(ARG &amp; 0x4110) == 0x4110" />
+		<add name="Unknown Int" type="uint" cond="(ARG &amp; 0x4110) == 0x4010" />
+
+		<add name="Vertex" type="HalfVector3" cond="(ARG &amp; 0x4010) == 0x10" />
+		<add name="Bitangent X" type="hfloat" cond="(ARG &amp; 0x4110) == 0x110" />
+		<add name="Unknown Short" type="ushort" cond="(ARG &amp; 0x4110) == 0x10" />
+
+		<add name="UV" type="HalfTexCoord" cond="ARG &amp; 0x20" />
+		<add name="Normal" type="ByteVector3" cond="ARG &amp; 0x80" />
+		<add name="Bitangent Y" type="byte" cond="ARG &amp; 0x80" />
+		<add name="Tangent" type="ByteVector3" cond="(ARG &amp; 0x180) == 0x180" />
+		<add name="Bitangent Z" type="byte" cond="(ARG &amp; 0x180) == 0x180" />
+		<add name="Vertex Colors" type="ByteColor4" cond="ARG &amp; 0x200" />
+		<add name="Bone Weights" type="hfloat" arr1="4" cond="ARG &amp; 0x400" />
+		<add name="Bone Indices" type="byte" arr1="4" cond="ARG &amp; 0x400" />
+		<add name="Eye Data" type="float" cond="ARG &amp; 0x1000" />
 	</compound>
 
 	<compound name="BSVertexDataSSE">
-		<add name="Vertex" type="Vector3" cond="((ARG &amp; 16) != 0)" />
-		<add name="Bitangent X" type="float" cond="((ARG &amp; 16) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
-		<add name="Unknown Int" type="int" cond="((ARG &amp; 16) != 0) &amp;&amp; (ARG &amp; 256) == 0" />
-		<add name="UV" type="HalfTexCoord" cond="((ARG &amp; 32) != 0)" />
-		<add name="Normal" type="ByteVector3" cond="(ARG &amp; 128) != 0" />
-		<add name="Bitangent Y" type="byte" cond="(ARG &amp; 128) != 0" />
-		<add name="Tangent" type="ByteVector3" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
-		<add name="Bitangent Z" type="byte" cond="((ARG &amp; 128) != 0) &amp;&amp; ((ARG &amp; 256) != 0)" />
-		<add name="Vertex Colors" type="ByteColor4" cond="(ARG &amp; 512) != 0" />
-		<add name="Bone Weights" type="hfloat" arr1="4" cond="(ARG &amp; 1024) != 0" />
-		<add name="Bone Indices" type="byte" arr1="4" cond="(ARG &amp; 1024) != 0" />
-		<add name="Eye Data" type="float" cond="(ARG &amp; 4096) != 0" />
+		<add name="Vertex" type="Vector3" cond="ARG &amp; 0x10" />
+		<add name="Bitangent X" type="float" cond="(ARG &amp; 0x110) == 0x110" />
+		<add name="Unknown Int" type="int" cond="(ARG &amp; 0x110) == 0x10" />
+		<add name="UV" type="HalfTexCoord" cond="ARG &amp; 0x20" />
+		<add name="Normal" type="ByteVector3" cond="ARG &amp; 0x80" />
+		<add name="Bitangent Y" type="byte" cond="ARG &amp; 0x80" />
+		<add name="Tangent" type="ByteVector3" cond="(ARG &amp; 0x180) == 0x180" />
+		<add name="Bitangent Z" type="byte" cond="(ARG &amp; 0x180) == 0x180" />
+		<add name="Vertex Colors" type="ByteColor4" cond="ARG &amp; 0x200" />
+		<add name="Bone Weights" type="hfloat" arr1="4" cond="ARG &amp; 0x400" />
+		<add name="Bone Indices" type="byte" arr1="4" cond="ARG &amp; 0x400" />
+		<add name="Eye Data" type="float" cond="ARG &amp; 0x1000" />
 	</compound>
 
     <compound name="BSVertexDesc">

From 8bc54168a234b30d16cb02595e8d056619dbdde7 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sun, 27 May 2018 11:09:28 -0400
Subject: [PATCH 15/86] Primary version indicators for #69

A concise way of listing which versions are most important to each game.

Each game should have only one set of `{{}}`.

Note:  In the case of Oblivion, there are two "primary" versions..  20.0.0.4 (10) is used for KF and 20.0.0.5 is used for NIF.  Thus I changed the "game name" to `{{Oblivion KF}}` for 20.0.0.4 (10).
---
 nif.xml | 49 +++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/nif.xml b/nif.xml
index 3ffb88c..f66abaf 100644
--- a/nif.xml
+++ b/nif.xml
@@ -3,7 +3,7 @@
 <niftoolsxml version="0.9.1.0">
     <!-- The versions found in use by the engine which have any amount of decoding or support from nif.xml
             NOTE: Hypothetical versions such as those used in version conditions must NOT receive version tags.
-    
+
         id = "VX_X_X_X": The unique identifier for this version. Can be used to generate C-style enums, etc.
         num = "X.X.X.X": The numeric representation created by storing each part of the version in a byte.
             Example:  4.0.0.2 == 0x04000002
@@ -21,35 +21,40 @@
             Note: A user or bsver of non-zero implies custom="true" and is not necessary.
         ext = "<List[string]>": Any custom NIF extensions associated with this version.
             Example: ext="bto btr"
+
+        Content: A comma-separated list of games which use this version.
+            `{{}}` around a game name denotes that this version is the primary version for that game.
+            A version without any `{{}}` names implies that this version is "secondary".
+            Note: A unique game name should only have `{{}}` around it once.
     -->
 
     <version id="V2_3" num="2.3" supported="false">Dark Age of Camelot</version>
     <version id="V3_0" num="3.0" supported="false">Star Trek: Bridge Commander</version>
     <version id="V3_03" num="3.03" supported="false">Dark Age of Camelot</version>
     <version id="V3_1" num="3.1" supported="false">Dark Age of Camelot, Star Trek: Bridge Commander</version>
-    <version id="V3_3_0_13" num="3.3.0.13">Oblivion, Munch's Oddysee</version>
+    <version id="V3_3_0_13" num="3.3.0.13">{{Munch's Oddysee}}, Oblivion</version>
     <version id="V4_0_0_0" num="4.0.0.0">Freedom Force</version>
-    <version id="V4_0_0_2" num="4.0.0.2">Morrowind, Freedom Force</version>
+    <version id="V4_0_0_2" num="4.0.0.2">{{Morrowind}}, {{Freedom Force}}</version>
     <version id="V4_1_0_12" num="4.1.0.12">Dark Age of Camelot</version>
     <version id="V4_2_0_2" num="4.2.0.2">Civilization IV</version>
     <version id="V4_2_1_0" num="4.2.1.0">Dark Age of Camelot, Civilization IV</version>
-    <version id="V4_2_2_0" num="4.2.2.0">Dark Age of Camelot, Civilization IV, Empire Earth II, Culpa Innata</version>
-    <version id="V10_0_1_0" num="10.0.1.0">Zoo Tycoon 2, Civilization IV, Oblivion</version>
+    <version id="V4_2_2_0" num="4.2.2.0">{{Culpa Innata}}, Civilization IV, Dark Age of Camelot, Empire Earth II</version>
+    <version id="V10_0_1_0" num="10.0.1.0">{{Zoo Tycoon 2}}, Civilization IV, Oblivion</version>
     <version id="V10_0_1_2" num="10.0.1.2" bsver="1 3">Oblivion</version>
-    <version id="V10_1_0_0" num="10.1.0.0">Dark Age of Camelot, Civilization IV, Freedom Force vs. the 3rd Reich, Axis and Allies, Kohan 2, Wildlife Park 2, The Guild 2, NeoSteam, Empire Earth II</version>
+    <version id="V10_1_0_0" num="10.1.0.0">{{Freedom Force vs. the 3rd Reich}}, {{Axis and Allies}}, {{Empire Earth II}}, {{Kohan 2}}, {{Sid Meier's Pirates!}}, Dark Age of Camelot, Civilization IV, Wildlife Park 2, The Guild 2, NeoSteam</version>
     <version id="V10_1_0_101" num="10.1.0.101" user="10" bsver="4">Oblivion</version>
     <version id="V10_1_0_106" num="10.1.0.106" user="10" bsver="5">Oblivion</version>
-    <version id="V10_2_0_0" num="10.2.0.0" user="0">Civilization IV, Loki, Pro Cycling Manager, Prison Tycoon, Red Ocean, Wildlife Park 2</version>
+    <version id="V10_2_0_0" num="10.2.0.0" user="0">{{Pro Cycling Manager}}, {{Prison Tycoon}}, {{Red Ocean}}, {{Wildlife Park 2}}, Civilization IV, Loki</version>
     <version id="V10_2_0_0__10" num="10.2.0.0" user="10" bsver="6 7 8 9">Oblivion</version>
     <version id="V10_2_0_1" num="10.2.0.1" custom="true">Worldshift</version>
     <version id="V10_3_0_1" num="10.3.0.1" custom="true">Worldshift</version>
-    <version id="V10_4_0_1" num="10.4.0.1" custom="true">Worldshift</version>
-    <version id="V20_0_0_4" num="20.0.0.4" user="0">Civilization IV, Sid Meier's Railroads, Florensia, Ragnarok Online 2, IRIS Online</version>
-    <version id="V20_0_0_4__10" num="20.0.0.4" user="10" bsver="11">Oblivion</version>
-    <version id="V20_0_0_4__11" num="20.0.0.4" user="11" bsver="11">Fallout 3 (few KF files, used, 1 NIF file, unused?)</version>
-    <version id="V20_0_0_5_OBL" num="20.0.0.5" user="10" bsver="11">Oblivion</version>
-    <version id="V20_1_0_3" num="20.1.0.3">Shin Megami Tensei: Imagine</version>
-    <version id="V20_2_0_7" num="20.2.0.7" user="0">Empire Earth III, Atlantica Online, Florensia, IRIS Online, Wizard101</version>
+    <version id="V10_4_0_1" num="10.4.0.1" custom="true">{{Worldshift}}</version>
+    <version id="V20_0_0_4" num="20.0.0.4" user="0">{{Civilization IV}}, {{Sid Meier's Railroads}}, Florensia, Ragnarok Online 2, IRIS Online</version>
+    <version id="V20_0_0_4__10" num="20.0.0.4" user="10" bsver="11">{{Oblivion KF}}</version>
+    <version id="V20_0_0_4__11" num="20.0.0.4" user="11" bsver="11">Fallout 3</version>
+    <version id="V20_0_0_5_OBL" num="20.0.0.5" user="10" bsver="11">{{Oblivion}}</version>
+    <version id="V20_1_0_3" num="20.1.0.3">{{Shin Megami Tensei: Imagine}}</version>
+    <version id="V20_2_0_7" num="20.2.0.7" user="0">{{Florensia}}, Empire Earth III, Atlantica Online, IRIS Online, Wizard101</version>
     <version id="V20_2_0_7__11_1" num="20.2.0.7" user="11" bsver="14">Fallout 3, Fallout NV</version>
     <version id="V20_2_0_7__11_2" num="20.2.0.7" user="11" bsver="16" ext="rdt">Fallout 3</version>
     <version id="V20_2_0_7__11_3" num="20.2.0.7" user="11" bsver="21">Fallout 3, Fallout NV</version>
@@ -58,19 +63,19 @@
     <version id="V20_2_0_7__11_6" num="20.2.0.7" user="11" bsver="26">Fallout 3, Fallout NV</version>
     <version id="V20_2_0_7__11_7" num="20.2.0.7" user="11" bsver="27 28">Fallout 3, Fallout NV</version>
     <version id="V20_2_0_7__11_8" num="20.2.0.7" user="11" bsver="30 31 32 33">Fallout 3, Fallout NV</version>
-    <version id="V20_2_0_7_FO3" num="20.2.0.7" user="11" bsver="34" ext="rdt">Fallout 3, Fallout NV</version>
-    <version id="V20_2_0_7_SKY" num="20.2.0.7" user="12" bsver="83" ext="bto btr">Skyrim</version>
-    <version id="V20_2_0_7_SSE" num="20.2.0.7" user="12" bsver="100" ext="bto btr">Skyrim SE</version>
-    <version id="V20_2_0_7_FO4" num="20.2.0.7" user="12" bsver="130" ext="bto btr">Fallout 4</version>
-    <version id="V20_2_0_8" num="20.2.0.8" ext="nifcache">Empire Earth III, Atlantica Online, FFT Online, IRIS Online, Wizard101</version>
+    <version id="V20_2_0_7_FO3" num="20.2.0.7" user="11" bsver="34" ext="rdt">{{Fallout 3}}, {{Fallout NV}}</version>
+    <version id="V20_2_0_7_SKY" num="20.2.0.7" user="12" bsver="83" ext="bto btr">{{Skyrim}}</version>
+    <version id="V20_2_0_7_SSE" num="20.2.0.7" user="12" bsver="100" ext="bto btr">{{Skyrim SE}}</version>
+    <version id="V20_2_0_7_FO4" num="20.2.0.7" user="12" bsver="130" ext="bto btr">{{Fallout 4}}</version>
+    <version id="V20_2_0_8" num="20.2.0.8" ext="nifcache">{{Empire Earth III}}, {{FFT Online}}, Atlantica Online, IRIS Online, Wizard101</version>
     <version id="V20_3_0_1" num="20.3.0.1">Emerge</version>
     <version id="V20_3_0_2" num="20.3.0.2">Emerge</version>
     <version id="V20_3_0_3" num="20.3.0.3">Emerge</version>
     <version id="V20_3_0_6" num="20.3.0.6">Emerge</version>
-    <version id="V20_3_0_9" num="20.3.0.9" user="0 0x10000" ext="nft item">Warhammer, Lazeska, Howling Sword, Bully SE, Divinity 2 (0x10000)</version>
-    <version id="V20_3_0_9_DIV2" num="20.3.0.9" user="0x20000 0x30000" ext="item">Divinity 2</version>
+    <version id="V20_3_0_9" num="20.3.0.9" user="0 0x10000" ext="nft item">{{Bully SE}}, Warhammer, Lazeska, Howling Sword, Ragnarok Online 2, Divinity 2 (0x10000)</version>
+    <version id="V20_3_0_9_DIV2" num="20.3.0.9" user="0x20000 0x30000" ext="item">{{Divinity 2}}</version>
     <version id="V20_5_0_0" num="20.5.0.0">MicroVolts, KrazyRain</version>
-    <version id="V20_6_0_0" num="20.6.0.0">MicroVolts, KrazyRain, Ragnarok Online 2, Atlantica Online, IRIS Online, Wizard101</version>
+    <version id="V20_6_0_0" num="20.6.0.0">{{MicroVolts}}, {{IRIS Online}}, {{Ragnarok Online 2}}, KrazyRain, Atlantica Online, Wizard101</version>
     <version id="V20_6_5_0_DEM" num="20.6.5.0" user="17" supported="false">Epic Mickey 2</version>
     <version id="V30_0_0_2" num="30.0.0.2">Emerge</version>
     <version id="V30_1_0_1" num="30.1.0.1">Emerge</version>

From 01f2b1d12b876593dcbd551c6717646acef20027 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sun, 27 May 2018 20:27:14 -0400
Subject: [PATCH 16/86] Fix for 10.1.0.0 NiPSysEmitterCtlr

---
 nif.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nif.xml b/nif.xml
index f66abaf..e5641b8 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2978,8 +2978,8 @@
         Particle system emitter controller.
         NiInterpController::GetInterpolatorID() string format:
             ['BirthRate', 'EmitterActive'] (for "Interpolator" and "Visibility Interpolator" respectively)
-        <add name="Visibility Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.0" /><!-- Minimum may be none? -->
         <add name="Data" type="Ref" template="NiPSysEmitterCtlrData" ver2="10.1.0.103" />
+        <add name="Visibility Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.104" />
     </niobject>
 
     <niobject name="NiPSysModifierBoolCtlr" abstract="1" inherit="NiPSysModifierCtlr">

From 08d732397a7a14b9115816b3dd0fba95f26bb6bf Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 31 May 2018 14:56:49 -0400
Subject: [PATCH 17/86] Initial linting fixes for #74

First batch of fixed issues detected by the new linter.

Also some slight cleanup, plus an interitance fix a Bethesda particle class.
---
 nif.xml | 62 +++++++++++++++++++--------------------------------------
 1 file changed, 20 insertions(+), 42 deletions(-)

diff --git a/nif.xml b/nif.xml
index e5641b8..54cc805 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1606,7 +1606,7 @@
         <add name="Translation" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0">The UV translation.</add>
         <add name="Scale" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0" default="1.0, 1.0">The UV scale.</add>
         <add name="Rotation" type="float" default="0.0" cond="Has Texture Transform" ver1="10.1.0.0">The W axis rotation in texture space.</add>
-        <add name="Transform Method" type="TransformMethod" default="0" cond="Has Texture Transform" ver1="10.1.0.0">Depending on the source, scaling can occur before or after rotation.</add>
+        <add name="Transform Method" type="TransformMethod" cond="Has Texture Transform" ver1="10.1.0.0">Depending on the source, scaling can occur before or after rotation.</add>
         <add name="Center" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0">The origin around which the texture rotates.</add>
     </compound>
 
@@ -1710,27 +1710,7 @@
 		<add name="Unknown Short" type="ushort" vercond="User Version 2 &gt; 34">Unknown</add>
 		<add name="Vertex Desc" type="BSVertexDesc" ver="20.2.0.7" userver2="100" />
 		<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver="20.2.0.7" userver2="100" />
-        <!-- related to the file posted in tracker item #3117836:
-            http://sourceforge.net/tracker/?func=detail&aid=3117836&group_id=149157&atid=776343 -->
-        <!--<add name="Unknown 83 C3" type="ushort" ver1="10.2.0.0" ver2="10.2.0.0" vercond="User Version == 1" ></add>
-        <add name="Unknown 00 00 1" type="ushort" ver1="10.2.0.0" ver2="10.2.0.0" vercond="User Version == 1"></add>
-        <add name="Num Vertices 2" type="ushort" ver1="10.2.0.0" ver2="10.2.0.0" vercond="User Version == 1"></add>
-        <add name="Unknown 00 00 2" type="ushort" ver1="10.2.0.0" ver2="10.2.0.0" vercond="User Version == 1"></add>
-        <add name="Unknown 00 00 3" type="ushort" ver1="10.2.0.0" ver2="10.2.0.0" vercond="User Version == 1"></add>
-        <add name="Unknown 00 00 4" type="ushort" ver1="10.2.0.0" ver2="10.2.0.0" vercond="User Version == 1"></add>
-        <add name="Unknown Arr 1" type="SkinPartitionUnknownItem1" arr1="Num Vertices 2" ver1="10.2.0.0" ver2="10.2.0.0" vercond="User Version == 1"></add>-->
-    </compound>
-
-    <!-- related to the file posted in tracker item #3117836:
-        http://sourceforge.net/tracker/?func=detail&aid=3117836&group_id=149157&atid=776343 -->
-    <!--<compound name="SkinPartitionUnknownItem1">
-        <add name="Unknown Flags" type="uint"></add>
-        <add name="f1" type="float"></add>
-        <add name="f2" type="float"></add>
-        <add name="f3" type="float"></add>
-        <add name="f4" type="float"></add>
-        <add name="f5" type="float"></add>
-    </compound>-->
+    </compound>
 
     <compound name="NiPlane">
         A plane.
@@ -2312,9 +2292,9 @@
         <add name="Shape" type="Ref" template="bhkShape"> Link to the body for this collision object.</add>
         <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
         <add name="Havok Filter" type="HavokFilter" />
-        <add name="Unused" type="byte" arr1="4">Garbage data from memory.</add>
-        <add name="Broad Phase Type" type="BroadPhaseType" default="1" />
-        <add name="Unused Bytes" type="byte" arr1="3" />
+        <add name="Unused Bytes 1" type="byte" arr1="4">Garbage data from memory.</add>
+        <add name="Broad Phase Type" type="BroadPhaseType" default="BROAD_PHASE_ENTITY" />
+        <add name="Unused Bytes 2" type="byte" arr1="3" />
         <add name="Cinfo Property" type="hkWorldObjCinfoProperty" />
     </niobject>
 
@@ -3029,7 +3009,7 @@
         Changes the image a Map (TexDesc) will use. Uses a float interpolator to animate the texture index.
         Often used for performing flipbook animation.
         <add name="Texture Slot" type="TexType">Target texture slot (0=base, 4=glow).</add>
-        <add name="Start Time" type="float" ver1="3.3.0.13" ver2="10.1.0.103" />
+        <add name="Accum Time" type="float" ver1="3.3.0.13" ver2="10.1.0.103" />
         <add name="Delta" type="float" ver2="10.1.0.103">
             Time between two flips.
             delta = (start_time - stop_time) / sources.num_indices
@@ -3731,7 +3711,7 @@
     <niobject name="NiLookAtController" inherit="NiTimeController">
         DEPRECATED (10.2), REMOVED (20.5)
         Replaced by NiTransformController and NiLookAtInterpolator.
-        <add name="Flags" type="LookAtFlags" ver1="10.1.0.0" />
+        <add name="Look At Flags" type="LookAtFlags" ver1="10.1.0.0" />
         <add name="Look At" type="Ptr" template="NiNode" />
     </niobject>
 
@@ -4203,22 +4183,20 @@
     </niobject>
     
     <niobject name="BSPSysInheritVelocityModifier" inherit="NiPSysModifier">
-        <add name="Target" type="Ptr" template="NiNode" />
+        <add name="Inherit Object" type="Ptr" template="NiAVObject" />
         <add name="Chance To Inherit" type="float" />
         <add name="Velocity Multiplier" type="float" />
         <add name="Velocity Variation" type="float" />
     </niobject>
     
-    <niobject name="BSPSysHavokUpdateModifier" inherit="NiPSysModifier">
-        <add name="Num Nodes" type="uint" />
-        <add name="Nodes" type="Ref" template="NiNode" arr1="Num Nodes" />
+    <niobject name="BSPSysHavokUpdateModifier" inherit="NiPSysMeshUpdateModifier">
         <add name="Modifier" type="Ref" template="NiPSysModifier" />
-    </niobject>   
+    </niobject>
 
     <niobject name="BSPSysRecycleBoundModifier" inherit="NiPSysModifier">
         <add name="Bound Offset" type="Vector3" />
         <add name="Bound Extent" type="Vector3" />
-        <add name="Target" type="Ptr" template="NiNode" />
+        <add name="Bound Object" type="Ptr" template="NiAVObject" />
     </niobject> 
     
     <niobject name="BSPSysSubTexModifier" inherit="NiPSysModifier">
@@ -5249,8 +5227,8 @@
         <add name="Is Convex" type="bool" ver2="20.3.0.4" />
         <add name="Mesh Name" type="string" />
         <add name="Mesh Data" type="ByteArray" />
-        <add name="Mesh Size" type="ushort" ver1="20.3.0.5" ver2="30.2.0.2" />
-        <add name="Mesh Data" type="ushort" arr1="Mesh Size" ver1="20.3.0.5" ver2="30.2.0.2" />
+        <add name="Back Compat Vertex Map Size" type="ushort" ver1="20.3.0.5" ver2="30.2.0.2" />
+        <add name="Back Compat Vertex Map" type="ushort" arr1="Back Compat Vertex Map Size" ver1="20.3.0.5" ver2="30.2.0.2" />
         <add name="Mesh Flags" type="uint" />
         <add name="Mesh Paging Mode" type="uint" ver1="20.3.0.1" />
         <add name="Is Hardware" type="bool" ver1="20.3.0.2" ver2="20.3.0.4" />
@@ -5490,9 +5468,9 @@
         <option value="4" name="Refraction_Tint">Refraction Tint</option>
         <option value="5" name="Vertex_Colors">Has Vertex Colors</option>
         <option value="6" name="Unknown1">Unknown</option>
-        <option value="7" name="1st_Light_is_Point_Light">1st Light is Point Light</option>
-        <option value="8" name="2nd_Light">2nd Light</option>
-        <option value="9" name="3rd_Light">3rd Light</option>
+        <option value="7" name="First_Light_is_Point_Light">1st Light is Point Light</option>
+        <option value="8" name="Second_Light">2nd Light</option>
+        <option value="9" name="Third_Light">3rd Light</option>
         <option value="10" name="Vertex_Lighting">Vertex Lighting</option>
         <option value="11" name="Uniform_Scale">Uniform Scale</option>
         <option value="12" name="Fit_Slope">Fit Slope</option>
@@ -5527,7 +5505,7 @@
 
     <niobject name="BSShaderLightingProperty" abstract="1" inherit="BSShaderProperty">
         Bethesda-specific property.
-        <add name="Texture Clamp Mode" type="TexClampMode" default="3" vercond="(User Version 2 &lt;= 34)">How to handle texture borders.</add>
+        <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" vercond="(User Version 2 &lt;= 34)">How to handle texture borders.</add>
     </niobject>
 
     <niobject name="BSShaderNoLightingProperty" inherit="BSShaderLightingProperty">
@@ -5819,7 +5797,7 @@
         <add name="Emissive Color" type="Color3" default="0.0, 0.0, 0.0">Glow color and alpha</add>
         <add name="Emissive Multiple" type="float">Multiplied emissive colors</add>
         <add name="Wet Material" type="string" vercond="(User Version 2 == 130)" />
-        <add name="Texture Clamp Mode" type="TexClampMode" default="3">How to handle texture borders.</add>
+        <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T">How to handle texture borders.</add>
         <add name="Alpha" type="float" default="1.0">The material opacity (1=non-transparent).</add>
         <add name="Refraction Strength" type="float">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
         <add name="Glossiness" type="float" default="80" vercond="User Version 2 &lt; 130">The material specular power, or glossiness (0-999).</add>
@@ -6225,7 +6203,7 @@
 
     <niobject name="bhkAabbPhantom" inherit="bhkShapePhantom">
         Bethesda-specific Havok serializable.
-        <add name="Unused" type="byte" arr1="8" />
+        <add name="Unused Bytes 3" type="byte" arr1="8" />
         <add name="AABB Min" type="Vector4" />
         <add name="AABB Max" type="Vector4" />
     </niobject>
@@ -6664,7 +6642,7 @@
         <add name="Scale Amount V" type="float" />
         <add name="Scale Limit V" type="float" />
         <add name="Scale Rest V" type="float" />
-        <add name="Center U " type="float" />
+        <add name="Center U" type="float" />
         <add name="Center V" type="float" />
         <add name="UV Scrolling" type="bool" />
         <add name="Num Frames Across" type="ushort" />

From 1d62f16195128b81023709143dd07e0bdc08b3b3 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 31 May 2018 15:25:27 -0400
Subject: [PATCH 18/86] Initial Commit for #71

First-pass implementation of `since`/`until` and `versions`.  Avoided nearly all Bethesda blocks for now, as they require the token system or would become absurdly repetitious.
---
 nif.xml | 518 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 260 insertions(+), 258 deletions(-)

diff --git a/nif.xml b/nif.xml
index 54cc805..9bfe548 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1434,19 +1434,19 @@
         <add name="Nodes" type="Ptr" template="NiNode" arr1="Num Nodes">The list of NiNode references.</add>
     </compound>
 
-    <compound name="ShortString" ver1="10.1.0.0">
+    <compound name="ShortString">
         Another string format, for short strings.  Specific to Bethesda-specific header tags.
         <add name="Length" type="byte">The string length.</add>
         <add name="Value" type="char" arr1="Length">The string itself, null terminated (the null terminator is taken into account in the length byte).</add>
     </compound>
 
-    <compound name="SkinInfo">
+    <compound name="SkinInfo" since="V4_2_2_0">
         NiBoneLODController::SkinInfo. Reference to shape and skin instance.
         <add name="Shape" type="Ptr" template="NiTriBasedGeom" />
         <add name="Skin Instance" type="Ref" template="NiSkinInstance" />
     </compound>
 
-    <compound name="SkinInfoSet" ver1="10.0.1.0">
+    <compound name="SkinInfoSet" since="V4_2_2_0">
         A set of NiBoneLODController::SkinInfo.
         <add name="Num Skin Info" type="uint" />
         <add name="Skin Info" type="SkinInfo" arr1="Num Skin Info" />
@@ -1685,7 +1685,7 @@
         <add name="VF8" type="byte" />
     </compound>
 
-    <compound name="SkinPartition" ver1="4.2.1.0">
+    <compound name="SkinPartition" since="V4_2_1_0">
         Skinning data for a submesh, optimized for hardware skinning. Part of NiSkinPartition.
         <add name="Num Vertices" type="ushort">Number of vertices in this submesh.</add>
         <add name="Num Triangles" type="ushort" calculated="1">Number of triangles in this submesh.</add>
@@ -2207,7 +2207,7 @@
         Abstract object type.
     </niobject>
 
-    <niobject name="Ni3dsAlphaAnimator" inherit="NiObject">
+    <niobject name="Ni3dsAlphaAnimator" inherit="NiObject" versions="V2_3">
         Unknown.
         <add name="Unknown 1" type="byte" arr1="40">Unknown.</add>
         <add name="Parent" type="Ref" template="NiObject">The parent?</add>
@@ -2216,7 +2216,7 @@
         <add name="Unknown 2" type="uint" arr1="Num 1" arr2="Num 2" arr3="2">Unknown.</add>
     </niobject>
 
-    <niobject name="Ni3dsAnimationNode" inherit="NiObject">
+    <niobject name="Ni3dsAnimationNode" inherit="NiObject" versions="V2_3">
         Unknown. Only found in 2.3 nifs.
         <add name="Name" type="string">Name of this object.</add>
         <add name="Has Data" type="bool">Unknown.</add>
@@ -2228,28 +2228,28 @@
         <add name="Unknown Array" type="byte" arr1="Count" arr2="5" cond="Has Data">Unknown.</add>
     </niobject>
 
-    <niobject name="Ni3dsColorAnimator" inherit="NiObject">
+    <niobject name="Ni3dsColorAnimator" inherit="NiObject" versions="V2_3">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="184">Unknown.</add>
     </niobject>
 
-    <niobject name="Ni3dsMorphShape" inherit="NiObject">
+    <niobject name="Ni3dsMorphShape" inherit="NiObject" versions="V2_3">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="14">Unknown.</add>
     </niobject>
 
-    <niobject name="Ni3dsParticleSystem" inherit="NiObject">
+    <niobject name="Ni3dsParticleSystem" inherit="NiObject" versions="V2_3">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="14">Unknown.</add>
     </niobject>
 
-    <niobject name="Ni3dsPathController" inherit="NiObject">
+    <niobject name="Ni3dsPathController" inherit="NiObject" versions="V2_3">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="20">Unknown.</add>
     </niobject>
 
 
-    <niobject name="NiParticleModifier" abstract="1" inherit="NiObject">
+    <niobject name="NiParticleModifier" abstract="1" inherit="NiObject" until="V10_0_1_0">
         LEGACY (pre-10.1). Abstract base class for particle system modifiers.
         <add name="Next Modifier" type="Ref" template="NiParticleModifier">Next particle modifier.</add>
         <add name="Controller" type="Ptr" template="NiParticleSystemController" ver1="4.0.0.2">Points to the particle system controller parent.</add>
@@ -3368,13 +3368,13 @@
         <add name="Speed to Aspect Speed 2" type="float" vercond="(User Version 2 &gt; 34)" />
     </niobject>
 
-    <niobject name="NiRotatingParticlesData" inherit="NiParticlesData">
+    <niobject name="NiRotatingParticlesData" inherit="NiParticlesData" until="V10_0_1_0">
         Rotating particles data object.
         <add name="Has Rotations 2" type="bool" ver2="4.2.2.0">Is the particle rotation array present?</add>
         <add name="Rotations 2" type="Quaternion" arr1="Num Vertices" cond="Has Rotations 2" ver2="4.2.2.0">The individual particle rotations.</add>
     </niobject>
 
-    <niobject name="NiAutoNormalParticlesData" inherit="NiParticlesData">
+    <niobject name="NiAutoNormalParticlesData" inherit="NiParticlesData" until="V10_0_1_0">
         Particle system data object (with automatic normals?).
     </niobject>
 
@@ -3412,13 +3412,13 @@
         <add name="Binary Data" type="ByteArray">The binary data.</add>
     </niobject>
 
-    <niobject name="NiBinaryVoxelExtraData" inherit="NiExtraData">
+    <niobject name="NiBinaryVoxelExtraData" inherit="NiExtraData" until="V3_1">
         Voxel extra data object.
         <add name="Unknown Int" type="uint" default="0">Unknown.  0?</add>
         <add name="Data" type="Ref" template="NiBinaryVoxelData">Link to binary voxel data.</add>
     </niobject>
 
-    <niobject name="NiBinaryVoxelData" inherit="NiObject">
+    <niobject name="NiBinaryVoxelData" inherit="NiObject" until="V3_1">
         Voxel data object.
         <add name="Unknown Short 1" type="ushort">Unknown.</add>
         <add name="Unknown Short 2" type="ushort">Unknown.</add>
@@ -3613,7 +3613,7 @@
         <add name="Flags" type="Flags">1 = Enable dithering</add>
     </niobject>
 
-    <niobject name="NiRollController" inherit="NiSingleInterpController">
+    <niobject name="NiRollController" inherit="NiSingleInterpController" until="V20_5_0_0">
         DEPRECATED (10.2), REMOVED (20.5). Replaced by NiTransformController and NiLookAtInterpolator.
         <add name="Data" type="Ref" template="NiFloatData">The data for the controller.</add>
     </niobject>
@@ -3647,7 +3647,7 @@
         <add name="Fog Color" type="Color3">The color of the fog.</add>
     </niobject>
 
-    <niobject name="NiGravity" inherit="NiParticleModifier">
+    <niobject name="NiGravity" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier. Applies a gravitational field on the particles.
         <add name="Unknown Float 1" type="float" ver1="3.3.0.13">Unknown.</add>
         <add name="Force" type="float">The strength/force of this gravity.</add>
@@ -3708,7 +3708,7 @@
         <option value="2" name="LOOK_Z_AXIS">Z-Axis</option>
     </bitflags>
 
-    <niobject name="NiLookAtController" inherit="NiTimeController">
+    <niobject name="NiLookAtController" inherit="NiTimeController" until="V20_5_0_0">
         DEPRECATED (10.2), REMOVED (20.5)
         Replaced by NiTransformController and NiLookAtInterpolator.
         <add name="Look At Flags" type="LookAtFlags" ver1="10.1.0.0" />
@@ -3759,21 +3759,21 @@
         A NiNode used as a skeleton bone?
     </niobject>
 
-    <niobject name="AvoidNode" inherit="NiNode">
+    <niobject name="AvoidNode" inherit="NiNode" versions="V4_0_0_2">
         Morrowind specific.
     </niobject>
 
-    <niobject name="FxWidget" inherit="NiNode">
+    <niobject name="FxWidget" inherit="NiNode" versions="V10_0_1_0">
         Firaxis-specific UI widgets?
         <add name="Unknown 3" type="byte">Unknown.</add>
         <add name="Unknown 292 Bytes" type="byte" arr1="292">Looks like 9 links and some string data.</add>
     </niobject>
 
-    <niobject name="FxButton" inherit="FxWidget">
+    <niobject name="FxButton" inherit="FxWidget" versions="V10_0_1_0">
         Unknown.
     </niobject>
 
-    <niobject name="FxRadioButton" inherit="FxWidget">
+    <niobject name="FxRadioButton" inherit="FxWidget" versions="V10_0_1_0">
         Unknown.
         <add name="Unknown Int 1" type="uint">Unknown.</add>
         <add name="Unknown Int 2" type="uint">Unknown.</add>
@@ -3841,7 +3841,7 @@
         <add name="Palette" type="ByteColor4" arr1="256" cond="Num Entries != 16">The color palette.</add>
     </niobject>
 
-    <niobject name="NiParticleBomb" inherit="NiParticleModifier">
+    <niobject name="NiParticleBomb" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Decay" type="float" />
         <add name="Duration" type="float" />
@@ -3853,24 +3853,24 @@
         <add name="Direction" type="Vector3">The direction of the applied acceleration?</add>
     </niobject>
 
-    <niobject name="NiParticleColorModifier" inherit="NiParticleModifier">
+    <niobject name="NiParticleColorModifier" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Color Data" type="Ref" template="NiColorData" />
     </niobject>
 
-    <niobject name="NiParticleGrowFade" inherit="NiParticleModifier">
+    <niobject name="NiParticleGrowFade" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Grow" type="float">The time from the beginning of the particle lifetime during which the particle grows.</add>
         <add name="Fade" type="float">The time from the end of the particle lifetime during which the particle fades.</add>
     </niobject>
 
-    <niobject name="NiParticleMeshModifier" inherit="NiParticleModifier">
+    <niobject name="NiParticleMeshModifier" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Num Particle Meshes" type="uint" />
         <add name="Particle Meshes" arr1="Num Particle Meshes" type="Ref" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiParticleRotation" inherit="NiParticleModifier">
+    <niobject name="NiParticleRotation" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Random Initial Axis" type="byte" />
         <add name="Initial Axis" type="Vector3" />
@@ -3882,15 +3882,15 @@
         <add name="Vertex Desc" type="BSVertexDesc" vercond="(User Version 2 &gt;= 100)" />
     </niobject>
 
-    <niobject name="NiAutoNormalParticles" inherit="NiParticles">
+    <niobject name="NiAutoNormalParticles" inherit="NiParticles" until="V10_0_1_0">
         LEGACY (pre-10.1). NiParticles which do not house normals and generate them at runtime.
     </niobject>
 
-    <niobject name="NiParticleMeshes" inherit="NiParticles">
+    <niobject name="NiParticleMeshes" inherit="NiParticles" until="V10_0_1_0">
         LEGACY (pre-10.1). Particle meshes.
     </niobject>
 
-    <niobject name="NiParticleMeshesData" inherit="NiRotatingParticlesData">
+    <niobject name="NiParticleMeshesData" inherit="NiRotatingParticlesData" until="V10_0_1_0">
         LEGACY (pre-10.1). Particle meshes data.
         <add name="Unknown Link 2" type="Ref" template="NiAVObject">Refers to the mesh that makes up a particle?</add>
     </niobject>
@@ -3913,7 +3913,7 @@
         Particle system.
     </niobject>
 
-    <niobject name="NiParticleSystemController" inherit="NiTimeController">
+    <niobject name="NiParticleSystemController" inherit="NiTimeController" until="V10_0_1_0">
         A generic particle system time controller object.
         <add name="Old Speed" type="uint" ver2="3.1">Particle speed in old files</add>
         <add name="Speed" type="float" ver1="3.3.0.13">Particle speed</add>
@@ -3966,11 +3966,11 @@
         <add name="Unknown Floats 2" arr1="Particle Unknown Short" type="float" ver2="3.1" />
     </niobject>
 
-    <niobject name="NiBSPArrayController" inherit="NiParticleSystemController">
+    <niobject name="NiBSPArrayController" inherit="NiParticleSystemController" until="V10_0_1_0">
         A particle system controller, used by BS in conjunction with NiBSParticleNode.
     </niobject>
 
-    <niobject name="NiPathController" inherit="NiTimeController">
+    <niobject name="NiPathController" inherit="NiTimeController" until="V20_5_0_0">
         DEPRECATED (10.2), REMOVED (20.5). Replaced by NiTransformController and NiPathInterpolator.
         Time controller for a path.
         <add name="Path Flags" type="PathFlags" ver1="10.1.0.0" />
@@ -4044,7 +4044,7 @@
         <add name="Pixel Data" type="byte" binary="1" arr1="Num Pixels * Num Faces" ver1="10.4.0.2" />
     </niobject>
 
-    <niobject name="NiPlanarCollider" inherit="NiParticleModifier">
+    <niobject name="NiPlanarCollider" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Unknown Short" type="ushort" ver1="10.0.1.0">Usually 0?</add>
         <add name="Unknown Float 1" type="float">Unknown.</add>
@@ -4256,7 +4256,7 @@
     </niobject>
 
     <!-- WorldShift -->
-    <niobject name="NiPSysPartSpawnModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysPartSpawnModifier" inherit="NiPSysModifier" versions="V10_2_0_1 V10_3_0_1 V10_4_0_1">
         <add name="Unk Float 1" type="float" />
         <add name="Unk Float 2" type="float" />
         <add name="Spawner" type="Ref" template="NiPSysSpawnModifier" />
@@ -4416,11 +4416,11 @@
         <add name="Proportion Levels" type="float" arr1="Num Proportions" />
     </niobject>
 
-    <niobject name="NiRotatingParticles" inherit="NiParticles">
+    <niobject name="NiRotatingParticles" inherit="NiParticles" until="V10_0_1_0">
         Unknown.
     </niobject>
 
-    <niobject name="NiSequenceStreamHelper" inherit="NiObjectNET">
+    <niobject name="NiSequenceStreamHelper" inherit="NiObjectNET" until="V20_2_0_8">
         DEPRECATED (pre-10.1), REMOVED (20.3).
         Keyframe animation root node, in .kf files.
     </niobject>
@@ -4458,10 +4458,6 @@
         <add name="Bone Data" type="OldSkinData" arr1="Num Bones" arr2="Vertex Counts">Contains skin weight data for each node that this skin is influenced by.</add>
     </niobject>
 
-    <niobject name="NiClodSkinInstance" inherit="NiSkinInstance">
-        A copy of NISkinInstance for use with NiClod meshes.
-    </niobject>
-
     <niobject name="NiSkinPartition" inherit="NiObject">
         Skinning data, optimized for hardware skinning. The mesh is partitioned in submeshes such that each vertex of a submesh is influenced only by a limited and fixed number of bones.
         <add name="Num Skin Partition Blocks" type="uint" />
@@ -4503,7 +4499,7 @@
         <add name="Flags" type="Flags">Bit 0 = Enable specular lighting on this shape.</add>
     </niobject>
 
-    <niobject name="NiSphericalCollider" inherit="NiParticleModifier">
+    <niobject name="NiSphericalCollider" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Unknown Float 1" type="float">Unknown.</add>
         <add name="Unknown Short 1" type="ushort">Unknown.</add>
@@ -4588,7 +4584,7 @@
         <add name="Unknown Short" type="ushort" ver2="4.1.0.12">Unknown: 0.</add>
     </niobject>
 
-    <niobject name="NiTextureModeProperty" inherit="NiProperty">
+    <niobject name="NiTextureModeProperty" inherit="NiProperty" until="V10_0_1_0">
         LEGACY (pre-10.1)
         <add name="Unknown Ints" type="uint" arr1="3" ver2="2.3" />
         <add name="Unknown Short" type="short" ver1="3.0">Unknown. Either 210 or 194.</add>
@@ -4596,7 +4592,7 @@
         <add name="PS2 K" type="short" default="-75" ver1="3.1" ver2="10.2.0.0">-75?</add>
     </niobject>
 
-    <niobject name="NiImage" inherit="NiObject">
+    <niobject name="NiImage" inherit="NiObject" until="V10_0_1_0">
         LEGACY (pre-10.1)
         <add name="Use External" type="byte">0 if the texture is internal to the NIF file.</add>
         <add name="File Name" type="FilePath" cond="Use External != 0">The filepath to the texture.</add>
@@ -4605,7 +4601,7 @@
         <add name="Unknown Float" type="float" ver1="3.1" default="128.5">Unknown.  Perhaps fImageScale?</add>
     </niobject>
 
-    <niobject name="NiTextureProperty" inherit="NiProperty">
+    <niobject name="NiTextureProperty" inherit="NiProperty" until="V10_0_1_0">
         LEGACY (pre-10.1)
         <add name="Unknown Ints 1" type="uint" arr1="2" ver2="2.3">Property flags.</add>
         <add name="Flags" type="Flags" ver1="3.0">Property flags.</add>
@@ -4688,7 +4684,7 @@
         <add name="Points" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="Has Points" ver1="10.0.1.3">The points in the Triangle strips. Size is the sum of all entries in Strip Lengths.</add>
     </niobject>
 
-    <niobject name="NiEnvMappedTriShape" inherit="NiObjectNET">
+    <niobject name="NiEnvMappedTriShape" inherit="NiObjectNET" until="V10_0_1_0">
         Unknown
         <add name="Unknown 1" type="ushort">unknown (=4 - 5)</add>
         <add name="Unknown Matrix" type="Matrix44">unknown</add>
@@ -4698,11 +4694,11 @@
         <add name="Child 3" type="Ref" template="NiObject">unknown</add>
     </niobject>
 
-    <niobject name="NiEnvMappedTriShapeData" inherit="NiTriShapeData">
+    <niobject name="NiEnvMappedTriShapeData" inherit="NiTriShapeData" until="V10_0_1_0">
         Holds mesh data using a list of singular triangles.
     </niobject>
 
-    <niobject name="NiBezierTriangle4" inherit="NiObject">
+    <niobject name="NiBezierTriangle4" inherit="NiObject" until="V10_0_1_0">
         LEGACY (pre-10.1)
         Sub data of NiBezierMesh
         <add name="Unknown 1" type="uint" arr1="6">unknown</add>
@@ -4716,7 +4712,7 @@
         <add name="Unknown 6" type="short" arr1="24">unknown</add>
     </niobject>
 
-    <niobject name="NiBezierMesh" inherit="NiAVObject">
+    <niobject name="NiBezierMesh" inherit="NiAVObject" until="V10_0_1_0">
         LEGACY (pre-10.1)
         Unknown
         <add name="Num Bezier Triangles" type="uint">references.</add>
@@ -4732,37 +4728,40 @@
         <add name="Data 2" type="ushort" arr1="Count 2" arr2="4">data count.</add>
     </niobject>
 
-
-
-    <niobject name="NiClod" inherit="NiTriBasedGeom">
+    <niobject name="NiClod" inherit="NiTriBasedGeom" until="V4_0_0_2">
         A shape node that holds continuous level of detail information.
         Seems to be specific to Freedom Force.
+        Found in: Freedom Force, Spellbinder
     </niobject>
 
-    <niobject name="NiClodData" inherit="NiTriBasedGeomData">
+    <niobject name="NiClodData" inherit="NiTriBasedGeomData" until="V4_0_0_2">
         Holds mesh data for continuous level of detail shapes.
-        Pesumably a progressive mesh with triangles specified by edge splits.
-        Seems to be specific to Freedom Force.
-        The structure of this is uncertain and highly experimental at this point.
-        <add name="Unknown Shorts" type="ushort"></add>
-        <add name="Unknown Count 1" type ="ushort"></add>
-        <add name="Unknown Count 2" type ="ushort"></add>
-        <add name="Unknown Count 3" type ="ushort"></add>
-        <add name="Unknown Float" type="float"></add>
-        <add name="Unknown Short" type="ushort"></add>
-        <add name="Unknown Clod Shorts 1" type="ushort" arr1="Unknown Count 1" arr2="6"></add>
-        <add name="Unknown Clod Shorts 2" type ="ushort" arr1="Unknown Count 2"></add>
-        <add name="Unknown Clod Shorts 3" type ="ushort" arr1="Unknown Count 3" arr2="6"></add>
+        Presumably a progressive mesh with triangles specified by edge splits.
+        Found in: Freedom Force, Spellbinder
+        <add name="Unknown Shorts" type="ushort" />
+        <add name="Unknown Count 1" type ="ushort" />
+        <add name="Unknown Count 2" type ="ushort" />
+        <add name="Unknown Count 3" type ="ushort" />
+        <add name="Unknown Float" type="float" />
+        <add name="Unknown Short" type="ushort" />
+        <add name="Unknown Clod Shorts 1" type="ushort" arr1="Unknown Count 1" arr2="6" />
+        <add name="Unknown Clod Shorts 2" type="ushort" arr1="Unknown Count 2" />
+        <add name="Unknown Clod Shorts 3" type="ushort" arr1="Unknown Count 3" arr2="6" />
+    </niobject>
+
+    <niobject name="NiClodSkinInstance" inherit="NiSkinInstance" until="V4_0_0_2">
+        A copy of NiSkinInstance for use with NiClod meshes.
+        Found in: Freedom Force, Spellbinder
     </niobject>
 
-    <niobject name="NiUVController" inherit="NiTimeController">
+    <niobject name="NiUVController" inherit="NiTimeController" until="V20_2_0_8">
         DEPRECATED (pre-10.1), REMOVED (20.3).
         Time controller for texture coordinates.
         <add name="Unknown Short" type="ushort">Always 0?</add>
         <add name="Data" type="Ref" template="NiUVData">Texture coordinate controller data index.</add>
     </niobject>
 
-    <niobject name="NiUVData" inherit="NiObject">
+    <niobject name="NiUVData" inherit="NiObject" until="V20_2_0_8">
         DEPRECATED (pre-10.1), REMOVED (20.3)
         Texture coordinate data.
         <add name="UV Groups" type="KeyGroup" template="float" arr1="4">
@@ -4823,11 +4822,11 @@
         </add>
     </niobject>
 
-    <niobject name="RootCollisionNode" inherit="NiNode">
+    <niobject name="RootCollisionNode" inherit="NiNode" versions="V4_0_0_2">
         Morrowind-specific node for collision mesh.
     </niobject>
 
-    <niobject name="NiRawImageData" inherit="NiObject">
+    <niobject name="NiRawImageData" inherit="NiObject" until="V3_1">
         LEGACY (pre-10.1)
         Raw image data.
         <add name="Width" type="uint">Image width</add>
@@ -4851,7 +4850,7 @@
 
     <!-- NiPhysX -->
 
-    <niobject name="NiPhysXScene" inherit="NiObjectNET">
+    <niobject name="NiPhysXScene" inherit="NiObjectNET" since="V20_2_0_8">
         Object which manages a NxScene object and the Gamebryo objects that interact with it.
         <add name="Scene Transform" type="NiTransform" />
         <add name="PhysX to World Scale" type="float" />
@@ -4871,41 +4870,41 @@
         <add name="Flags" type="ushort" />
     </niobject>
 
-    <enum name="NiSceneDescNxBroadPhaseType" storage="uint">
+    <enum name="NiSceneDescNxBroadPhaseType" storage="uint" since="V20_2_0_8">
         <option name="NX_BROADPHASE_QUADRATIC" value="0" />
         <option name="NX_BROADPHASE_FULL" value="1" />
         <option name="NX_BROADPHASE_COHERENT" value="2" />
     </enum>
 
-    <enum name="NiSceneDescNxHwPipelineSpec" storage="uint">
+    <enum name="NiSceneDescNxHwPipelineSpec" storage="uint" since="V20_2_0_8">
         <option name="NX_HW_RB_PIPELINE_HLP_ONLY" value="0" />
         <option name="NX_HW_PIPELINE_FULL" value="1" />
         <option name="NX_HW_PIPELINE_DEBUG" value="2" />
     </enum>
 
-    <enum name="NiSceneDescNxHwSceneType" storage="uint">
+    <enum name="NiSceneDescNxHwSceneType" storage="uint" since="V20_2_0_8">
         <option name="NX_HW_SCENE_TYPE_RB" value="0" />
         <option name="NX_HW_SCENE_TYPE_FLUID" value="1" />
         <option name="NX_HW_SCENE_TYPE_FLUID_SOFTWARE" value="2" />
         <option name="NX_HW_SCENE_TYPE_CLOTH" value="3" />
     </enum>
 
-    <enum name="NxTimeStepMethod" storage="uint">
+    <enum name="NxTimeStepMethod" storage="uint" since="V20_2_0_8">
         <option name="NX_TIMESTEP_FIXED" value="0" />
         <option name="NX_TIMESTEP_VARIABLE" value="1" />
     </enum>
 
-    <enum name="NxSimulationType" storage="uint">
+    <enum name="NxSimulationType" storage="uint" since="V20_2_0_8">
         <option name="NX_SIMULATION_SW" value="0" />
         <option name="NX_SIMULATION_HW" value="1" />
     </enum>
 
-    <enum name="NxBroadPhaseType" storage="uint">
+    <enum name="NxBroadPhaseType" storage="uint" since="V20_2_0_8">
         <option name="NX_BP_TYPE_SAP_SINGLE" value="0" />
         <option name="NX_BP_TYPE_SAP_MULTI" value="1" />
     </enum>
 
-    <enum name="NxFilterOp" storage="uint">
+    <enum name="NxFilterOp" storage="uint" since="V20_2_0_8">
         <option name="NX_FILTEROP_AND" value="0" />
         <option name="NX_FILTEROP_OR" value="1" />
         <option name="NX_FILTEROP_XOR" value="2" />
@@ -4915,18 +4914,18 @@
         <option name="NX_FILTEROP_SWAP_AND" value="6" />
     </enum>
 
-    <enum name="NxCompartmentType" storage="uint">
+    <enum name="NxCompartmentType" storage="uint" since="V20_2_0_8">
         <option name="NX_SCT_RIGIDBODY" value="0" />
         <option name="NX_SCT_FLUID" value="1" />
         <option name="NX_SCT_CLOTH" value="2" />
     </enum>
 
-    <compound name="PhysXSceneDescMaterial">
+    <compound name="PhysXSceneDescMaterial" since="V20_2_0_8">
         <add name="Key" type="ushort" />
         <add name="Material" type="Ref" template="NiPhysXMaterialDesc" />
     </compound>
 
-    <compound name="PhysXSceneDescCompartment">
+    <compound name="PhysXSceneDescCompartment" since="V20_2_0_8">
         <add name="ID" type="uint" />
         <add name="Type" type="NxCompartmentType" />
         <add name="Device Code" type="uint" />
@@ -4934,7 +4933,7 @@
         <add name="Grid Hash Table Power" type="uint" />
     </compound>
 
-    <niobject name="NiPhysXSceneDesc" inherit="NiObject">
+    <niobject name="NiPhysXSceneDesc" inherit="NiObject" since="V20_2_0_8">
         Object which caches the properties of NxScene, stored as a snapshot in a NiPhysXScene.
         <add name="Broad Phase Type" type="NiSceneDescNxBroadPhaseType" ver2="20.2.0.7" />
         <add name="Gravity" type="Vector3" />
@@ -4989,7 +4988,7 @@
         <add name="Compartments" type="PhysXSceneDescCompartment" arr1="Num Compartments" ver1="20.3.0.6" />
     </niobject>
 
-    <niobject name="NiPhysXProp" inherit="NiObjectNET">
+    <niobject name="NiPhysXProp" inherit="NiObjectNET" since="V20_2_0_8">
         A PhysX prop which holds information about PhysX actors in a Gamebryo scene
         <add name="PhysX to World Scale" type="float" />
         <add name="Num Sources" type="uint" />
@@ -5003,17 +5002,17 @@
         <add name="Prop Description" type="Ref" template="NiPhysXPropDesc" />
     </niobject>
 
-    <compound name="PhysXMaterialRef">
+    <compound name="PhysXMaterialRef" since="V20_2_0_8">
         <add name="Key" type="ushort" />
         <add name="Material Desc" type="Ref" template="NiPhysXMaterialDesc" />
     </compound>
 
-    <compound name="PhysXStateName">
+    <compound name="PhysXStateName" since="V20_2_0_8">
         <add name="Name" type="string" />
         <add name="Index" type="uint" />
     </compound>
 
-    <niobject name="NiPhysXPropDesc" inherit="NiObject">
+    <niobject name="NiPhysXPropDesc" inherit="NiObject" since="V20_2_0_8">
         For serialization of PhysX objects and to attach them to the scene.
         <add name="Num Actors" type="int" />
         <add name="Actors" type="Ref" template="NiPhysXActorDesc" arr1="Num Actors" />
@@ -5029,7 +5028,7 @@
         <add name="Flags" type="byte" ver1="20.4.0.0" />
     </niobject>
 
-    <niobject name="NiPhysXActorDesc" inherit="NiObject">
+    <niobject name="NiPhysXActorDesc" inherit="NiObject" since="V20_2_0_8">
         For serializing NxActor objects.
         <add name="Actor Name" type="string" />
         <add name="Num Poses" type="uint" />
@@ -5049,13 +5048,13 @@
         <add name="Dest" type="Ref" template="NiPhysXRigidBodyDest" />
     </niobject>
 
-    <compound name="PhysXBodyStoredVels">
+    <compound name="PhysXBodyStoredVels" since="V20_2_0_8">
         <add name="Linear Velocity" type="Vector3" />
         <add name="Angular Velocity" type="Vector3" />
         <add name="Sleep" type="bool" ver1="30.2.0.3" />
     </compound>
 
-    <niobject name="NiPhysXBodyDesc" inherit="NiObject">
+    <niobject name="NiPhysXBodyDesc" inherit="NiObject" since="V20_2_0_8">
         For serializing NxBodyDesc objects.
         <add name="Local Pose" type="Matrix34" />
         <add name="Space Inertia" type="Vector3" />
@@ -5076,7 +5075,7 @@
         <add name="Contact Report Threshold" type="float" ver1="20.4.0.0" />
     </niobject>
 
-    <enum name="NxJointType" storage="uint">
+    <enum name="NxJointType" storage="uint" since="V20_2_0_8">
         <option name="NX_JOINT_PRISMATIC" value="0" />
         <option name="NX_JOINT_REVOLUTE" value="1" />
         <option name="NX_JOINT_CYLINDRICAL" value="2" />
@@ -5089,51 +5088,51 @@
         <option name="NX_JOINT_D6" value="9" />
     </enum>
 
-    <enum name="NxD6JointMotion" storage="uint">
+    <enum name="NxD6JointMotion" storage="uint" since="V20_2_0_8">
         <option name="NX_D6JOINT_MOTION_LOCKED" value="0" />
         <option name="NX_D6JOINT_MOTION_LIMITED" value="1" />
         <option name="NX_D6JOINT_MOTION_FREE" value="2" />
     </enum>
 
-    <enum name="NxD6JointDriveType" storage="uint">
+    <enum name="NxD6JointDriveType" storage="uint" since="V20_2_0_8">
         <option name="NX_D6JOINT_DRIVE_POSITION" value="1" />
         <option name="NX_D6JOINT_DRIVE_VELOCITY" value="2" />
     </enum>
 
-    <enum name="NxJointProjectionMode" storage="uint">
+    <enum name="NxJointProjectionMode" storage="uint" since="V20_2_0_8">
         <option name="NX_JPM_NONE" value="0" />
         <option name="NX_JPM_POINT_MINDIST" value="1" />
         <option name="NX_JPM_LINEAR_MINDIST" value="2" />
     </enum>
 
-    <compound name="NiPhysXJointActor">
+    <compound name="NiPhysXJointActor" since="V20_2_0_8">
         <add name="Actor" type="Ref" template="NiPhysXActorDesc" />
         <add name="Local Normal" type="Vector3" />
         <add name="Local Axis" type="Vector3" />
         <add name="Local Anchor" type="Vector3" />
     </compound>
 
-    <compound name="NxJointLimitSoftDesc">
+    <compound name="NxJointLimitSoftDesc" since="V20_2_0_8">
         <add name="Value" type="float" />
         <add name="Restitution" type="float" />
         <add name="Spring" type="float" />
         <add name="Damping" type="float" />
     </compound>
 
-    <compound name="NxJointDriveDesc">
+    <compound name="NxJointDriveDesc" since="V20_2_0_8">
         <add name="Drive Type" type="NxD6JointDriveType" />
         <add name="Restitution" type="float" />
         <add name="Spring" type="float" />
         <add name="Damping" type="float" />
     </compound>
 
-    <compound name="NiPhysXJointLimit">
+    <compound name="NiPhysXJointLimit" since="V20_2_0_8">
         <add name="Limit Plane Normal" type="Vector3" />
         <add name="Limit Plane D" type="float" />
         <add name="Limit Plane R" type="float" ver1="20.4.0.0" />
     </compound>
 
-    <niobject name="NiPhysXJointDesc" inherit="NiObject" abstract="1">
+    <niobject name="NiPhysXJointDesc" inherit="NiObject" abstract="1" since="V20_2_0_8">
         A PhysX Joint abstract base class.
         <add name="Joint Type" type="NxJointType" />
         <add name="Joint Name" type="string" />
@@ -5148,7 +5147,7 @@
         <add name="Limits" type="NiPhysXJointLimit" arr1="Num Limits" />
     </niobject>
 
-    <niobject name="NiPhysXD6JointDesc" inherit="NiPhysXJointDesc">
+    <niobject name="NiPhysXD6JointDesc" inherit="NiPhysXJointDesc" since="V20_2_0_8">
         A 6DOF (6 degrees of freedom) joint.
         <add name="X Motion" type="NxD6JointMotion" />
         <add name="Y Motion" type="NxD6JointMotion" />
@@ -5178,7 +5177,7 @@
         <add name="Flags" type="uint" />
     </niobject>
 
-    <enum name="NxShapeType" storage="uint">
+    <enum name="NxShapeType" storage="uint" since="V20_2_0_8">
         <option name="NX_SHAPE_PLANE" value="0" />
         <option name="NX_SHAPE_SPHERE" value="1" />
         <option name="NX_SHAPE_BOX" value="2" />
@@ -5191,18 +5190,18 @@
         <option name="NX_SHAPE_COMPOUND" value="9" />
     </enum>
 
-    <compound name="NxPlane">
+    <compound name="NxPlane" since="V20_2_0_8">
         <add name="Val 1" type="float" />
         <add name="Point 1" type="Vector3" />
     </compound>
 
-    <compound name="NxCapsule">
+    <compound name="NxCapsule" since="V20_2_0_8">
         <add name="Val 1" type="float" />
         <add name="Val 2" type="float" />
         <add name="Capsule Flags" type="uint" />
     </compound>
 
-    <niobject name="NiPhysXShapeDesc" inherit="NiObject">
+    <niobject name="NiPhysXShapeDesc" inherit="NiObject" since="V20_2_0_8">
         For serializing NxShapeDesc objects
         <add name="Shape Type" type="NxShapeType" />
         <add name="Local Pose" type="Matrix34" />
@@ -5222,7 +5221,7 @@
         <add name="Mesh" type="Ref" template="NiPhysXMeshDesc" cond="(Shape Type == 5) || (Shape Type == 6)" />
     </niobject>
 
-    <niobject name="NiPhysXMeshDesc" inherit="NiObject">
+    <niobject name="NiPhysXMeshDesc" inherit="NiObject" since="V20_2_0_8">
         Holds mesh data for streaming.
         <add name="Is Convex" type="bool" ver2="20.3.0.4" />
         <add name="Mesh Name" type="string" />
@@ -5235,7 +5234,7 @@
         <add name="Flags" type="byte" ver1="20.3.0.5" />
     </niobject>
 
-    <bitflags name="NxMaterialFlag" storage="uint">
+    <bitflags name="NxMaterialFlag" storage="uint" since="V20_2_0_8">
         <option name="NX_MF_ANISOTROPIC" value="1" />
         <option name="NX_MF_DUMMY1" value="2" />
         <option name="NX_MF_DUMMY2" value="3" />
@@ -5244,20 +5243,20 @@
         <option name="NX_MF_DISABLE_STRONG_FRICTION" value="6" />
     </bitflags>
 
-    <compound name="NxSpringDesc">
+    <compound name="NxSpringDesc" since="V20_2_0_8">
         <add name="Spring" type="float" />
         <add name="Damper" type="float" />
         <add name="Target Value" type="float" />
     </compound>
 
-    <enum name="NxCombineMode" storage="uint">
+    <enum name="NxCombineMode" storage="uint" since="V20_2_0_8">
         <option name="NX_CM_AVERAGE" value="0" />
         <option name="NX_CM_MIN" value="1" />
         <option name="NX_CM_MULTIPLY" value="2" />
         <option name="NX_CM_MAX" value="3" />
     </enum>
 
-    <compound name="NxMaterialDesc">
+    <compound name="NxMaterialDesc" since="V20_2_0_8">
         <add name="Dynamic Friction" type="float" />
         <add name="Static Friction" type="float" />
         <add name="Restitution" type="float" />
@@ -5271,44 +5270,44 @@
         <add name="Spring" type="NxSpringDesc" ver2="20.2.3.0" cond="Has Spring" />
     </compound>
 
-    <niobject name="NiPhysXMaterialDesc" inherit="NiObject">
+    <niobject name="NiPhysXMaterialDesc" inherit="NiObject" since="V20_2_0_8">
         For serializing NxMaterialDesc objects.
         <add name="Index" type="ushort" />
         <add name="Num States" type="uint" />
         <add name="Material Descs" type="NxMaterialDesc" arr1="Num States" />
     </niobject>
 
-    <niobject name="NiPhysXDest" inherit="NiObject" abstract="1">
+    <niobject name="NiPhysXDest" inherit="NiObject" abstract="1" since="V20_2_0_8">
         A destination is a link between a PhysX actor and a Gamebryo object being driven by the physics.
         <add name="Active" type="bool" />
         <add name="Interpolate" type="bool" />
     </niobject>
 
-    <niobject name="NiPhysXRigidBodyDest" inherit="NiPhysXDest" abstract="1">
+    <niobject name="NiPhysXRigidBodyDest" inherit="NiPhysXDest" abstract="1" since="V20_2_0_8">
         Base for destinations that set a rigid body state.
     </niobject>
 
-    <niobject name="NiPhysXTransformDest" inherit="NiPhysXRigidBodyDest">
+    <niobject name="NiPhysXTransformDest" inherit="NiPhysXRigidBodyDest" since="V20_2_0_8">
         Connects PhysX rigid body actors to a scene node.
         <add name="Target" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPhysXSrc" inherit="NiObject" abstract="1">
+    <niobject name="NiPhysXSrc" inherit="NiObject" abstract="1" since="V20_2_0_8">
         A source is a link between a Gamebryo object and a PhysX actor.
         <add name="Active" type="bool" />
         <add name="Interpolate" type="bool" />
     </niobject>
 
-    <niobject name="NiPhysXRigidBodySrc" inherit="NiPhysXSrc" abstract="1">
+    <niobject name="NiPhysXRigidBodySrc" inherit="NiPhysXSrc" abstract="1" since="V20_2_0_8">
         Sets state of a rigid body PhysX actor.
         <add name="Source" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPhysXKinematicSrc" inherit="NiPhysXRigidBodySrc">
+    <niobject name="NiPhysXKinematicSrc" inherit="NiPhysXRigidBodySrc" since="V20_2_0_8">
         Sets state of kinematic PhysX actor.
     </niobject>
 
-    <niobject name="NiPhysXDynamicSrc" inherit="NiPhysXRigidBodySrc">
+    <niobject name="NiPhysXDynamicSrc" inherit="NiPhysXRigidBodySrc" since="V20_2_0_8">
         Sends Gamebryo scene state to a PhysX dynamic actor.
     </niobject>
 
@@ -6264,20 +6263,20 @@
         <add name="Constraint" type="ConstraintData" arr1="Num Constraints" />
     </niobject>
 
-    <compound name="Region">
+    <compound name="Region" since="V20_5_0_0">
         A range of indices, which make up a region (such as a submesh).
         <add name="Start Index" type="uint" />
         <add name="Num Indices" type="uint" />
     </compound>
 
-    <enum name="CloningBehavior" storage="uint">
+    <enum name="CloningBehavior" storage="uint" since="V20_5_0_0">
         Sets how objects are to be cloned.
         <option value="0" name="CLONING_SHARE">Share this object pointer with the newly cloned scene.</option>
         <option value="1" name="CLONING_COPY">Create an exact duplicate of this object for use with the newly cloned scene.</option>
         <option value="2" name="CLONING_BLANK_COPY">Create a copy of this object for use with the newly cloned stream, leaving some of the data to be written later.</option>
     </enum>
 
-    <enum name="ComponentFormat" storage="uint">
+    <enum name="ComponentFormat" storage="uint" since="V20_5_0_0">
         The data format of components.
         <option value="0x00000000" name="F_UNKNOWN">Unknown, or don't care, format.</option>
         <option value="0x00010101" name="F_INT8_1"></option>
@@ -6344,7 +6343,7 @@
         <option value="0x0001043E" name="F_UINT_10_10_10_2"></option>
     </enum>
 
-    <enum name="DataStreamUsage" storage="uint">
+    <enum name="DataStreamUsage" storage="uint" since="V20_5_0_0">
         Determines how a data stream is used?
         <option value="0" name="USAGE_VERTEX_INDEX"></option>
         <option value="1" name="USAGE_VERTEX"></option>
@@ -6352,7 +6351,7 @@
         <option value="3" name="USAGE_USER"></option>
     </enum>
     
-    <bitflags name="DataStreamAccess" storage="uint">
+    <bitflags name="DataStreamAccess" storage="uint" since="V20_5_0_0">
         Determines how the data stream is accessed?
         <option value="0" name="CPU Read"></option>
         <option value="1" name="CPU Write Static"></option>
@@ -6364,7 +6363,7 @@
     </bitflags>
 
 
-    <niobject name="NiDataStream" inherit="NiObject">
+    <niobject name="NiDataStream" inherit="NiObject" since="V20_5_0_0">
         <add name="Usage" type="DataStreamUsage" abstract="1"></add>
         <add name="Access" type="DataStreamAccess" abstract="1"></add>
         <add name="Num Bytes" type="uint">The size in bytes of this data stream.</add>
@@ -6377,7 +6376,7 @@
         <add name="Streamable" type="bool" default="1" />
     </niobject>
 
-    <compound name="SemanticData">
+    <compound name="SemanticData" since="V20_5_0_0">
         <add name="Name" type="string">
             Type of data (POSITION, POSITION_BP, INDEX, NORMAL, NORMAL_BP,
             TEXCOORD, BLENDINDICES, BLENDWEIGHT, BONE_PALETTE, COLOR, DISPLAYLIST,
@@ -6390,7 +6389,7 @@
         </add>
     </compound>
 
-    <compound name="DataStreamRef">
+    <compound name="DataStreamRef" since="V20_5_0_0">
         <add name="Stream" type="Ref" template="NiDataStream">
             Reference to a data stream object which holds the data used by
             this reference.
@@ -6411,12 +6410,12 @@
         <add name="Component Semantics" type="SemanticData" arr1="Num Components">Describes the semantic of each component.</add>
     </compound>
 
-    <niobject name="NiRenderObject" abstract="1" inherit="NiAVObject">
+    <niobject name="NiRenderObject" abstract="1" inherit="NiAVObject" since="V20_5_0_0">
         An object that can be rendered.
         <add name="Material Data" type="MaterialData">Per-material data.</add>
     </niobject>
 
-    <enum name="MeshPrimitiveType" storage="uint">
+    <enum name="MeshPrimitiveType" storage="uint" since="V20_5_0_0">
         Describes the type of primitives stored in a mesh object.
         <option value="0" name="MESH_PRIMITIVE_TRIANGLES">Triangle primitive type.</option>
         <option value="1" name="MESH_PRIMITIVE_TRISTRIPS">Triangle strip primitive type.</option>
@@ -6426,7 +6425,7 @@
         <option value="5" name="MESH_PRIMITIVE_POINTS">Point primitive type.</option>
     </enum>
 
-    <enum name="SyncPoint" storage="ushort">
+    <enum name="SyncPoint" storage="ushort" since="V20_5_0_0">
         A sync point corresponds to a particular stage in per-frame processing.
         <option value="0x8000" name="SYNC_ANY">Synchronize for any sync points that the modifier supports.</option>
         <option value="0x8010" name="SYNC_UPDATE">Synchronize when an object is updated.</option>
@@ -6461,7 +6460,7 @@
         <add name="Unknown Shorts" type="short" arr1="10" />
     </compound>
 
-    <niobject name="NiMesh" inherit="NiRenderObject">
+    <niobject name="NiMesh" inherit="NiRenderObject" since="V20_5_0_0">
         <add name="Primitive Type" type="MeshPrimitiveType">The primitive type of the mesh, such as triangles or lines.</add>
 
         <!-- start: epic mickey (user version 15) unknowns -->
@@ -6500,7 +6499,7 @@
         <!-- end: epic mickey (user version 15) unknowns -->
     </niobject>
 
-    <niobject name="NiMorphWeightsController" inherit="NiInterpController">
+    <niobject name="NiMorphWeightsController" inherit="NiInterpController" since="V20_5_0_0">
         Manipulates a mesh with the semantic MORPHWEIGHTS using an NiMorphMeshModifier.
         <add name="Count" type="uint" />
         <add name="Num Interpolators" type="uint" />
@@ -6509,12 +6508,12 @@
         <add name="Target Names" type="string" arr1="Num Targets" />
     </niobject>
 
-    <compound name="ElementReference" ver1="20.5.0.0">
+    <compound name="ElementReference" since="V20_5_0_0">
         <add name="Semantic" type="SemanticData">The element semantic.</add>
         <add name="Normalize Flag" type="uint">Whether or not to normalize the data.</add>
     </compound>
 
-    <niobject name="NiMorphMeshModifier" inherit="NiMeshModifier">
+    <niobject name="NiMorphMeshModifier" inherit="NiMeshModifier" since="V20_5_0_0">
         Performs linear-weighted blending between a set of target data streams.
         <add name="Flags" type="byte">
             FLAG_RELATIVETARGETS = 0x01
@@ -6530,7 +6529,7 @@
         <add name="Elements" type="ElementReference" arr1="Num Elements">Semantics and normalization of the morphing data stream elements.</add>
     </niobject>
 
-    <niobject name="NiSkinningMeshModifier" inherit="NiMeshModifier">
+    <niobject name="NiSkinningMeshModifier" inherit="NiMeshModifier" since="V20_5_0_0">
         <add name="Flags" type="ushort">
             USE_SOFTWARE_SKINNING = 0x0001
             RECOMPUTE_BOUNDS = 0x0002
@@ -6543,13 +6542,13 @@
         <add name="Bone Bounds" type="NiBound" cond="(Flags &amp; 2)!=0" arr1="Num Bones">The bounds of the bones.  Only stored if the RECOMPUTE_BOUNDS bit is set.</add>
     </niobject>
 
-    <niobject name="NiMeshHWInstance" inherit="NiAVObject">
+    <niobject name="NiMeshHWInstance" inherit="NiAVObject" since="V20_5_0_0">
         An instance of a hardware-instanced mesh in a scene graph.
         <add name="Master Mesh" type="Ref" template="NiMesh">The instanced mesh this object represents.</add>
         <add name="Mesh Modifier" type="Ref" template="NiInstancingMeshModifier" />
     </niobject>
 
-    <niobject name="NiInstancingMeshModifier" inherit="NiMeshModifier">
+    <niobject name="NiInstancingMeshModifier" inherit="NiMeshModifier" since="V20_5_0_0">
         Mesh modifier that provides per-frame instancing capabilities in Gamebryo.
         <add name="Has Instance Nodes" type="bool" />
         <add name="Per Instance Culling" type="bool" />
@@ -6580,12 +6579,12 @@
 
     <!-- NiPS Particle System -->
 
-    <compound name="PSSpawnRateKey">
+    <compound name="PSSpawnRateKey" since="V20_5_0_0">
         <add name="Value" type="float" />
         <add name="Time" type="float" />
     </compound>
 
-    <enum name="AlignMethod" storage="uint">
+    <enum name="AlignMethod" storage="uint" since="V20_5_0_0">
         Describes the various methods that may be used to specify the orientation of the particles.
         <option value="0" name="ALIGN_INVALID" />
         <option value="1" name="ALIGN_PER_PARTICLE" />
@@ -6595,7 +6594,7 @@
         <option value="16" name="ALIGN_CAMERA" />
     </enum>
 
-    <niobject name="NiPSParticleSystem" inherit="NiMesh">
+    <niobject name="NiPSParticleSystem" inherit="NiMesh" since="V20_5_0_0">
         Represents a particle system.
         <add name="Simulator" type="Ref" template="NiPSSimulator" />
         <add name="Generator" type="Ref" template="NiPSBoundUpdater" />
@@ -6618,9 +6617,12 @@
         <add name="Num Spawn Rate Keys" type="byte" ver1="20.6.1.0" />
         <add name="Spawn Rate Keys" type="PSSpawnRateKey" arr1="Num Spawn Rate Keys" ver1="20.6.1.0" />
         <add name="Pre RPI" type="bool" ver1="20.6.1.0" />
+        <!-- Epic Mickey -->
+        <add name="Unk Int" type="uint" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
+        <add name="Unk Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
     </niobject>
 
-    <niobject name="NiPSMeshParticleSystem" inherit="NiPSParticleSystem">
+    <niobject name="NiPSMeshParticleSystem" inherit="NiPSParticleSystem" since="V20_5_0_0">
         Represents a particle system that uses mesh particles instead of sprite-based particles.
         <add name="Num Generations" type="uint" />
         <add name="Master Particles" type="Ref" template="NiAVObject" arr1="Num Generations" />
@@ -6630,11 +6632,11 @@
 
     <!-- NiPS Generators -->
 
-    <niobject name="NiPSFacingQuadGenerator" inherit="NiMeshModifier">
+    <niobject name="NiPSFacingQuadGenerator" inherit="NiMeshModifier" since="V20_5_0_0">
         A mesh modifier that uses particle system data to generate camera-facing quads.
     </niobject>
 
-    <niobject name="NiPSAlignedQuadGenerator" inherit="NiMeshModifier">
+    <niobject name="NiPSAlignedQuadGenerator" inherit="NiMeshModifier" since="V20_5_0_0">
         A mesh modifier that uses particle system data to generate aligned quads for each particle.
         <add name="Scale Amount U" type="float" />
         <add name="Scale Limit U" type="float" />
@@ -6658,17 +6660,17 @@
 
     <!-- NiPS Simulators -->
 
-    <niobject name="NiPSSimulator" inherit="NiMeshModifier">
+    <niobject name="NiPSSimulator" inherit="NiMeshModifier" since="V20_5_0_0">
         The mesh modifier that performs all particle system simulation.
         <add name="Num Simulation Steps" type="uint" />
         <add name="Simulation Steps" type="Ref" template="NiPSSimulatorStep" arr1="Num Simulation Steps" />
     </niobject>
 
-    <niobject name="NiPSSimulatorStep" inherit="NiObject" abstract="1">
+    <niobject name="NiPSSimulatorStep" inherit="NiObject" abstract="1" since="V20_5_0_0">
         Abstract base class for a single step in the particle system simulation process.  It has no seralized data.
     </niobject>
 
-    <enum name="PSLoopBehavior" ver1="20.5.0.0" storage="uint">
+    <enum name="PSLoopBehavior" ver1="20.5.0.0" storage="uint" since="V20_5_0_0">
         <option name="PS_LOOP_CLAMP_BIRTH" value="0">Key times map such that the first key occurs at the birth of the particle, and times later than the last key get the last key value.</option>
         <option name="PS_LOOP_CLAMP_DEATH" value="1">Key times map such that the last key occurs at the death of the particle, and times before the initial key time get the value of the initial key.</option>
         <option name="PS_LOOP_AGESCALE" value="2">Scale the animation to fit the particle lifetime, so that the first key is age zero, and the last key comes at the particle death.</option>
@@ -6676,7 +6678,7 @@
         <option name="PS_LOOP_REFLECT" value="4">The time is reflection looped, as if the keys played forward then backward the forward then backward etc for all time.</option>
     </enum>
 
-    <niobject name="NiPSSimulatorGeneralStep" inherit="NiPSSimulatorStep">
+    <niobject name="NiPSSimulatorGeneralStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
         Encapsulates a floodgate kernel that updates particle size, colors, and rotations.
         <add name="Num Size Keys" type="byte" ver1="20.6.1.0" />
         <add name="Size Keys" type="Key" template="float" arg="1" arr1="Num Size Keys" ver1="20.6.1.0">The particle size keys.</add>
@@ -6693,37 +6695,37 @@
         <add name="Shrink Generation" type="ushort">Specifies the particle generation to which the shrink effect should be applied. This is usually the highest supported generation for the particle system, so that particles will shrink immediately before getting killed.</add>
     </niobject>
 
-    <niobject name="NiPSSimulatorForcesStep" inherit="NiPSSimulatorStep">
+    <niobject name="NiPSSimulatorForcesStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
         Encapsulates a floodgate kernel that simulates particle forces.
         <add name="Num Forces" type="uint" />
         <add name="Forces" type="Ref" template="NiPSForce" arr1="Num Forces">The forces affecting the particle system.</add>
     </niobject>
 
-    <niobject name="NiPSSimulatorCollidersStep" inherit="NiPSSimulatorStep">
+    <niobject name="NiPSSimulatorCollidersStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
         Encapsulates a floodgate kernel that simulates particle colliders.
         <add name="Num Colliders" type="uint" />
         <add name="Colliders" type="Ref" template="NiPSCollider" arr1="Num Colliders">The colliders affecting the particle system.</add>
     </niobject>
 
-    <niobject name="NiPSSimulatorMeshAlignStep" inherit="NiPSSimulatorStep">
+    <niobject name="NiPSSimulatorMeshAlignStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
         Encapsulates a floodgate kernel that updates mesh particle alignment and transforms.
         <add name="Num Rotation Keys" type="byte" />
         <add name="Rotation Keys" type="QuatKey" template="Quaternion" arg="1" arr1="Num Rotation Keys">The particle rotation keys.</add>
         <add name="Rotation Loop Behavior" type="PSLoopBehavior">The loop behavior for the rotation keys.</add>
     </niobject>
 
-    <niobject name="NiPSSimulatorFinalStep" inherit="NiPSSimulatorStep">
+    <niobject name="NiPSSimulatorFinalStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
         Encapsulates a floodgate kernel that updates particle positions and ages. As indicated by its name, this step should be attached last in the NiPSSimulator mesh modifier.
     </niobject>
 
-    <niobject name="NiPSBoundUpdater" inherit="NiObject">
+    <niobject name="NiPSBoundUpdater" inherit="NiObject" since="V20_5_0_0">
         Updates the bounding volume for an NiPSParticleSystem object.
         <add name="Update Skip" type="ushort">Number of particle bounds to skip updating every frame. Higher = more updates each frame.</add>
     </niobject>
 
     <!-- NiPS Forces -->
 
-    <enum name="PSForceType" storage="uint">
+    <enum name="PSForceType" storage="uint" since="V20_5_0_0">
         This is used by the Floodgate kernel to determine which NiPSForceHelpers functions to call.
         <option value="0" name="FORCE_BOMB" />
         <option value="1" name="FORCE_DRAG" />
@@ -6736,14 +6738,14 @@
         <option value="8" name="FORCE_GRAVITY" />
     </enum>
 
-    <niobject name="NiPSForce" abstract="1" inherit="NiObject">
+    <niobject name="NiPSForce" abstract="1" inherit="NiObject" since="V20_5_0_0">
         Abstract base class for all particle forces.
         <add name="Name" type="string" />
         <add name="Type" type="PSForceType" />
         <add name="Active" type="bool" />
     </niobject>
 
-    <niobject name="NiPSFieldForce" abstract="1" inherit="NiPSForce">
+    <niobject name="NiPSFieldForce" abstract="1" inherit="NiPSForce" since="V20_5_0_0">
         Abstract base class for all particle field forces.
         <add name="Field Object" type="Ref" template="NiAVObject" />
         <add name="Magnitude" type="float" />
@@ -6752,7 +6754,7 @@
         <add name="Max Distance" type="float" />
     </niobject>
 
-    <niobject name="NiPSDragForce" inherit="NiPSForce">
+    <niobject name="NiPSDragForce" inherit="NiPSForce" since="V20_5_0_0">
         Applies a linear drag force to particles.
         <add name="Drag Axis" type="Vector3" />
         <add name="Percentage" type="float" />
@@ -6761,7 +6763,7 @@
         <add name="Drag Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSGravityForce" inherit="NiPSForce">
+    <niobject name="NiPSGravityForce" inherit="NiPSForce" since="V20_5_0_0">
         Applies a gravitational force to particles.
         <add name="Gravity Axis" type="Vector3" />
         <add name="Decay" type="float" />
@@ -6772,7 +6774,7 @@
         <add name="Gravity Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSBombForce" inherit="NiPSForce">
+    <niobject name="NiPSBombForce" inherit="NiPSForce" since="V20_5_0_0">
         Applies an explosive force to particles.
         <add name="Bomb Axis" type="Vector3" />
         <add name="Decay" type="float" />
@@ -6782,7 +6784,7 @@
         <add name="Bomb Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSAirFieldForce" inherit="NiPSFieldForce">
+    <niobject name="NiPSAirFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of air movements.
         <add name="Direction" type="Vector3" />
         <add name="Air Friction" type="float" />
@@ -6792,35 +6794,35 @@
         <add name="Spread" type="float" />
     </niobject>
 
-    <niobject name="NiPSGravityFieldForce" inherit="NiPSFieldForce">
+    <niobject name="NiPSGravityFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of directional gravity.
         <add name="Direction" type="Vector3" />
     </niobject>
 
-    <niobject name="NiPSDragFieldForce" inherit="NiPSFieldForce">
+    <niobject name="NiPSDragFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of drag.
         <add name="Use Direction" type="bool" />
         <add name="Direction" type="Vector3" />
     </niobject>
 
-    <niobject name="NiPSRadialFieldForce" inherit="NiPSFieldForce">
+    <niobject name="NiPSRadialFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of point gravity.
         <add name="Radial Factor" type="float" />
     </niobject>
 
-    <niobject name="NiPSTurbulenceFieldForce" inherit="NiPSFieldForce">
+    <niobject name="NiPSTurbulenceFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of turbulence.
         <add name="Frequency" type="float" />
     </niobject>
 
-    <niobject name="NiPSVortexFieldForce" inherit="NiPSFieldForce">
+    <niobject name="NiPSVortexFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of a vortex.
         <add name="Direction" type="Vector3" />
     </niobject>
 
     <!-- NiPS Emitters -->
 
-    <niobject name="NiPSEmitter" abstract="1" inherit="NiObject">
+    <niobject name="NiPSEmitter" abstract="1" inherit="NiObject" since="V20_5_0_0">
         Abstract base class for all particle emitters.
         <add name="Name" type="string" />
         <add name="Speed" type="float" />
@@ -6845,36 +6847,36 @@
         <add name="Unknown" type="bool" ver1="30.0.0.0" ver2="30.0.0.1" />
     </niobject>
 
-    <niobject name="NiPSVolumeEmitter" abstract="1" inherit="NiPSEmitter">
+    <niobject name="NiPSVolumeEmitter" abstract="1" inherit="NiPSEmitter" since="V20_5_0_0">
         Abstract base class for particle emitters that emit particles from a volume.
         <add name="Emitter Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSBoxEmitter" inherit="NiPSVolumeEmitter">
+    <niobject name="NiPSBoxEmitter" inherit="NiPSVolumeEmitter" since="V20_5_0_0">
         A particle emitter that emits particles from a rectangular volume.
         <add name="Emitter Width" type="float" />
         <add name="Emitter Height" type="float" />
         <add name="Emitter Depth" type="float" />
     </niobject>
 
-    <niobject name="NiPSSphereEmitter" inherit="NiPSVolumeEmitter">
+    <niobject name="NiPSSphereEmitter" inherit="NiPSVolumeEmitter" since="V20_5_0_0">
         A particle emitter that emits particles from a spherical volume.
         <add name="Emitter Radius" type="float" />
     </niobject>
 
-    <niobject name="NiPSCylinderEmitter" inherit="NiPSVolumeEmitter">
+    <niobject name="NiPSCylinderEmitter" inherit="NiPSVolumeEmitter" since="V20_5_0_0">
         A particle emitter that emits particles from a cylindrical volume.
         <add name="Emitter Radius" type="float" />
         <add name="Emitter Height" type="float" />
     </niobject>
 
-    <niobject name="NiPSTorusEmitter" inherit="NiPSVolumeEmitter">
+    <niobject name="NiPSTorusEmitter" inherit="NiPSVolumeEmitter" since="V20_5_0_0">
         A particle emitter that emits particles from a toroidal volume.
         <add name="Emitter Radius" type="float" />
         <add name="Emitter Section Radius" type="float" />
     </niobject>
 
-    <niobject name="NiPSMeshEmitter" inherit="NiPSEmitter">
+    <niobject name="NiPSMeshEmitter" inherit="NiPSEmitter" since="V20_5_0_0">
         Emits particles from one or more NiMesh objects. A random mesh emitter is selected for each particle emission.
         <add name="Num Mesh Emitters" type="uint" />
         <add name="Mesh Emitters" type="Ptr" template="NiMesh" arr1="Num Mesh Emitters" />
@@ -6884,7 +6886,7 @@
         <add name="Initial Velocity Type" type="VelocityType" />
     </niobject>
 
-    <niobject name="NiPSCurveEmitter" inherit="NiPSEmitter">
+    <niobject name="NiPSCurveEmitter" inherit="NiPSEmitter" since="V20_5_0_0">
         Emits particles from a curve.
         <add name="Has Curve" type="bool" />
         <add name="Curve" type="NiCurve3" cond="Has Curve" />
@@ -6894,110 +6896,110 @@
 
     <!-- NiPS Controllers -->
 
-    <niobject name="NiPSEmitterCtlr" abstract="1" inherit="NiSingleInterpController">
+    <niobject name="NiPSEmitterCtlr" abstract="1" inherit="NiSingleInterpController" since="V20_5_0_0">
         Abstract base class for all particle emitter time controllers.
         <add name="Emitter Name" type="string" />
     </niobject>
 
-    <niobject name="NiPSEmitterFloatCtlr" abstract="1" inherit="NiPSEmitterCtlr">
+    <niobject name="NiPSEmitterFloatCtlr" abstract="1" inherit="NiPSEmitterCtlr" since="V20_5_0_0">
         Abstract base class for controllers that animate a floating point value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitParticlesCtlr" inherit="NiPSEmitterCtlr">
+    <niobject name="NiPSEmitParticlesCtlr" inherit="NiPSEmitterCtlr" since="V20_5_0_0">
         Animates particle emission and birth rate.
         <add name="Emitter Active Interpolator" type="Ref" template="NiInterpolator" />
     </niobject>
 
-    <niobject name="NiPSForceCtlr" abstract="1" inherit="NiSingleInterpController">
+    <niobject name="NiPSForceCtlr" abstract="1" inherit="NiSingleInterpController" since="V20_5_0_0">
         Abstract base class for all particle force time controllers.
         <add name="Force Name" type="string" />
     </niobject>
 
-    <niobject name="NiPSForceBoolCtlr" abstract="1" inherit="NiPSForceCtlr">
+    <niobject name="NiPSForceBoolCtlr" abstract="1" inherit="NiPSForceCtlr" since="V20_5_0_0">
         Abstract base class for controllers that animate a Boolean value on an NiPSForce object.
     </niobject>
 
-    <niobject name="NiPSForceFloatCtlr" abstract="1" inherit="NiPSForceCtlr">
+    <niobject name="NiPSForceFloatCtlr" abstract="1" inherit="NiPSForceCtlr" since="V20_5_0_0">
         Abstract base class for controllers that animate a floating point value on an NiPSForce object.
     </niobject>
 
-    <niobject name="NiPSForceActiveCtlr" inherit="NiPSForceBoolCtlr">
+    <niobject name="NiPSForceActiveCtlr" inherit="NiPSForceBoolCtlr" since="V20_5_0_0">
         Animates whether or not an NiPSForce object is active.
     </niobject>
 
-    <niobject name="NiPSGravityStrengthCtlr" inherit="NiPSForceFloatCtlr">
+    <niobject name="NiPSGravityStrengthCtlr" inherit="NiPSForceFloatCtlr" since="V20_5_0_0">
         Animates the strength value of an NiPSGravityForce object.
     </niobject>
 
-    <niobject name="NiPSFieldAttenuationCtlr" inherit="NiPSForceFloatCtlr">
+    <niobject name="NiPSFieldAttenuationCtlr" inherit="NiPSForceFloatCtlr" since="V20_5_0_0">
         Animates the attenuation value of an NiPSFieldForce object.
     </niobject>
 
-    <niobject name="NiPSFieldMagnitudeCtlr" inherit="NiPSForceFloatCtlr">
+    <niobject name="NiPSFieldMagnitudeCtlr" inherit="NiPSForceFloatCtlr" since="V20_5_0_0">
         Animates the magnitude value of an NiPSFieldForce object.
     </niobject>
 
-    <niobject name="NiPSFieldMaxDistanceCtlr" inherit="NiPSForceFloatCtlr">
+    <niobject name="NiPSFieldMaxDistanceCtlr" inherit="NiPSForceFloatCtlr" since="V20_5_0_0">
         Animates the max distance value of an NiPSFieldForce object.
     </niobject>
 
-    <niobject name="NiPSEmitterSpeedCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterSpeedCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the speed value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterRadiusCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterRadiusCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the size value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterDeclinationCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterDeclinationCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the declination value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterDeclinationVarCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterDeclinationVarCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the declination variation value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterPlanarAngleCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterPlanarAngleCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the planar angle value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterPlanarAngleVarCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterPlanarAngleVarCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the planar angle variation value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterRotAngleCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterRotAngleCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the rotation angle value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterRotAngleVarCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterRotAngleVarCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the rotation angle variation value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterRotSpeedCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterRotSpeedCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the rotation speed value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterRotSpeedVarCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterRotSpeedVarCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the rotation speed variation value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterLifeSpanCtlr" inherit="NiPSEmitterFloatCtlr">
+    <niobject name="NiPSEmitterLifeSpanCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
         Animates the lifespan value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSResetOnLoopCtlr" inherit="NiTimeController">
+    <niobject name="NiPSResetOnLoopCtlr" inherit="NiTimeController" since="V20_5_0_0">
         Calls ResetParticleSystem on an NiPSParticleSystem target upon looping.
     </niobject>
 
     <!-- NiPS Colliders -->
 
-    <enum name="ColliderType" storage="uint">
+    <enum name="ColliderType" storage="uint" since="V20_5_0_0">
         This is used by the Floodgate kernel to determine which NiPSColliderHelpers functions to call.
         <option value="0" name="COLLIDER_PLANAR" />
         <option value="1" name="COLLIDER_SPHERICAL" />
     </enum>
 
-    <niobject name="NiPSCollider" inherit="NiObject">
+    <niobject name="NiPSCollider" inherit="NiObject" since="V20_5_0_0">
         Abstract base class for all particle colliders.
         <add name="Spawner" type="Ref" template="NiPSSpawner" />
         <add name="Type" type="ColliderType" />
@@ -7007,7 +7009,7 @@
         <add name="Die on Collide" type="bool" />
     </niobject>
 
-    <niobject name="NiPSPlanarCollider" inherit="NiPSCollider">
+    <niobject name="NiPSPlanarCollider" inherit="NiPSCollider" since="V20_5_0_0">
         A planar collider for particles.
         <add name="Width" type="float" />
         <add name="Height" type="float" />
@@ -7016,13 +7018,13 @@
         <add name="Collider Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSSphericalCollider" inherit="NiPSCollider">
+    <niobject name="NiPSSphericalCollider" inherit="NiPSCollider" since="V20_5_0_0">
         A spherical collider for particles.
         <add name="Radius" type="float" />
         <add name="Collider Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSSpawner" inherit="NiObject">
+    <niobject name="NiPSSpawner" inherit="NiObject" since="V20_5_0_0">
         Creates a new particle whose initial parameters are based on an existing particle.
         <add name="Master Particle System" type="Ptr" template="NiPSParticleSystem" ver1="20.6.1.0" />
         <add name="Percentage Spawned" type="float" />
@@ -7038,7 +7040,7 @@
 
     <!-- NiPhysXPS -->
 
-    <niobject name="NiPhysXPSParticleSystem" inherit="NiPSParticleSystem">
+    <niobject name="NiPhysXPSParticleSystem" inherit="NiPSParticleSystem" since="V20_5_0_0">
         Implements Gamebryo particle systems that use PhysX actors for the particles
         <add name="Prop" type="Ptr" template="NiPhysXPSParticleSystemProp" />
         <add name="Dest" type="Ptr" template="NiPhysXPSParticleSystemDest" />
@@ -7051,32 +7053,32 @@
         <add name="Actor" type="Ptr" template="NiPhysXActorDesc" />
     </niobject>
 
-    <niobject name="NiPhysXPSParticleSystemProp" inherit="NiPhysXProp">
+    <niobject name="NiPhysXPSParticleSystemProp" inherit="NiPhysXProp" since="V20_5_0_0">
         A PhysX prop which holds information about a PhysX particle system prop.
         <add name="Num Systems" type="uint" />
         <add name="Systems" type="Ptr" template="NiPhysXPSParticleSystem" arr1="Num Systems" />
     </niobject>
 
-    <niobject name="NiPhysXPSParticleSystemDest" inherit="NiPhysXDest">
+    <niobject name="NiPhysXPSParticleSystemDest" inherit="NiPhysXDest" since="V20_5_0_0">
         An object which interfaces between the PhysX scene and the Gamebryo particle system.
         <add name="Target" type="Ptr" template="NiPSParticleSystem" />
     </niobject>
 
-    <niobject name="NiPhysXPSSimulator" inherit="NiPSSimulator">
+    <niobject name="NiPhysXPSSimulator" inherit="NiPSSimulator" since="V20_5_0_0">
         Adds additional sync points to a NiPSSimulator mesh modifier.
     </niobject>
 
-    <niobject name="NiPhysXPSSimulatorInitialStep" inherit="NiPSSimulatorStep">
+    <niobject name="NiPhysXPSSimulatorInitialStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
         Used to set the post-simulation state of particles in a physics-enabled particle system.
     </niobject>
 
-    <niobject name="NiPhysXPSSimulatorFinalStep" inherit="NiPSSimulatorStep">
+    <niobject name="NiPhysXPSSimulatorFinalStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
         Used to push the results of the particle system update into the PhysX actors.
     </niobject>
 
     <!-- NiEvaluator -->
 
-    <niobject name="NiEvaluator" abstract="1" inherit="NiObject">
+    <niobject name="NiEvaluator" abstract="1" inherit="NiObject" since="V20_5_0_0">
         <add name="Node Name" type="string">The name of the animated NiAVObject.</add>
         <add name="Property Type" type="string">The RTTI type of the NiProperty the controller is attached to, if applicable.</add>
         <add name="Controller Type" type="string">The RTTI type of the NiTimeController.</add>
@@ -7092,101 +7094,101 @@
         </add>
     </niobject>
 
-    <niobject name="NiKeyBasedEvaluator" abstract="1" inherit="NiEvaluator" />
+    <niobject name="NiKeyBasedEvaluator" abstract="1" inherit="NiEvaluator" since="V20_5_0_0" />
 
-    <niobject name="NiBoolEvaluator" inherit="NiKeyBasedEvaluator">
+    <niobject name="NiBoolEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiBoolData" />
     </niobject>
 
-    <niobject name="NiBoolTimelineEvaluator" inherit="NiBoolEvaluator" />
+    <niobject name="NiBoolTimelineEvaluator" inherit="NiBoolEvaluator" since="V20_5_0_0" />
 
-    <niobject name="NiColorEvaluator" inherit="NiKeyBasedEvaluator">
+    <niobject name="NiColorEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiColorData" />
     </niobject>
 
-    <niobject name="NiFloatEvaluator" inherit="NiKeyBasedEvaluator">
+    <niobject name="NiFloatEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiFloatData" />
     </niobject>
 
-    <niobject name="NiPoint3Evaluator" inherit="NiKeyBasedEvaluator">
+    <niobject name="NiPoint3Evaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiPosData" />
     </niobject>
 
-    <niobject name="NiQuaternionEvaluator" inherit="NiKeyBasedEvaluator">
+    <niobject name="NiQuaternionEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiRotData" />
     </niobject>
 
-    <niobject name="NiTransformEvaluator" inherit="NiKeyBasedEvaluator">
+    <niobject name="NiTransformEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
         <add name="Value" type="NiQuatTransform" />
         <add name="Data" type="Ref" template="NiTransformData" />
     </niobject>
 
-    <niobject name="NiConstBoolEvaluator" inherit="NiEvaluator">
+    <niobject name="NiConstBoolEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
         <add name="Value" type="float" default="-3.402823466e+38" /> <!-- Yes, this is actually a float. -->
     </niobject>
 
-    <niobject name="NiConstColorEvaluator" inherit="NiEvaluator">
+    <niobject name="NiConstColorEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
         <add name="Value" type="Color4" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
     </niobject>
 
-    <niobject name="NiConstFloatEvaluator" inherit="NiEvaluator">
+    <niobject name="NiConstFloatEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
         <add name="Value" type="float" default="-3.402823466e+38" />
     </niobject>
 
-    <niobject name="NiConstPoint3Evaluator" inherit="NiEvaluator">
+    <niobject name="NiConstPoint3Evaluator" inherit="NiEvaluator" since="V20_5_0_0">
         <add name="Value" type="Vector3" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
     </niobject>
 
-    <niobject name="NiConstQuaternionEvaluator" inherit="NiEvaluator">
+    <niobject name="NiConstQuaternionEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
         <add name="Value" type="Quaternion" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
     </niobject>
 
-    <niobject name="NiConstTransformEvaluator" inherit="NiEvaluator">
+    <niobject name="NiConstTransformEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
         <add name="Value" type="NiQuatTransform" />
     </niobject>
 
-    <niobject name="NiBSplineEvaluator" inherit="NiEvaluator">
+    <niobject name="NiBSplineEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
         <add name="Start Time" type="float" default="3.402823466e+38" />
         <add name="End Time" type="float" default="-3.402823466e+38" />
         <add name="Data" type="Ref" template="NiBSplineData" />
         <add name="Basis Data" type="Ref" template="NiBSplineBasisData" />
     </niobject>
 
-    <niobject name="NiBSplineColorEvaluator" inherit="NiBSplineEvaluator">
+    <niobject name="NiBSplineColorEvaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompColorEvaluator" inherit="NiBSplineColorEvaluator">
+    <niobject name="NiBSplineCompColorEvaluator" inherit="NiBSplineColorEvaluator" since="V20_5_0_0">
         <add name="Offset" type="float" default="3.402823466e+38" />
         <add name="Half Range" type="float" default="3.402823466e+38" />
     </niobject>
 
-    <niobject name="NiBSplineFloatEvaluator" inherit="NiBSplineEvaluator">
+    <niobject name="NiBSplineFloatEvaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompFloatEvaluator" inherit="NiBSplineFloatEvaluator">
+    <niobject name="NiBSplineCompFloatEvaluator" inherit="NiBSplineFloatEvaluator" since="V20_5_0_0">
         <add name="Offset" type="float" default="3.402823466e+38" />
         <add name="Half Range" type="float" default="3.402823466e+38" />
     </niobject>
 
-    <niobject name="NiBSplinePoint3Evaluator" inherit="NiBSplineEvaluator">
+    <niobject name="NiBSplinePoint3Evaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompPoint3Evaluator" inherit="NiBSplinePoint3Evaluator">
+    <niobject name="NiBSplineCompPoint3Evaluator" inherit="NiBSplinePoint3Evaluator" since="V20_5_0_0">
         <add name="Offset" type="float" default="3.402823466e+38" />
         <add name="Half Range" type="float" default="3.402823466e+38" />
     </niobject>
 
-    <niobject name="NiBSplineTransformEvaluator" inherit="NiBSplineEvaluator">
+    <niobject name="NiBSplineTransformEvaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
         <add name="Transform" type="NiQuatTransform" />
         <add name="Translation Handle" type="uint" default="0xFFFF">Handle into the translation data. (USHRT_MAX for invalid handle.)</add>
         <add name="Rotation Handle" type="uint" default="0xFFFF">Handle into the rotation data. (USHRT_MAX for invalid handle.)</add>
         <add name="Scale Handle" type="uint" default="0xFFFF">Handle into the scale data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompTransformEvaluator" inherit="NiBSplineTransformEvaluator">
+    <niobject name="NiBSplineCompTransformEvaluator" inherit="NiBSplineTransformEvaluator" since="V20_5_0_0">
         <add name="Translation Offset" type="float" default="3.402823466e+38" />
         <add name="Translation Half Range" type="float" default="3.402823466e+38" />
         <add name="Rotation Offset" type="float" default="3.402823466e+38" />
@@ -7195,7 +7197,7 @@
         <add name="Scale Half Range" type="float" default="3.402823466e+38" />
     </niobject>
 
-    <niobject name="NiLookAtEvaluator" inherit="NiEvaluator">
+    <niobject name="NiLookAtEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
         <add name="Flags" type="LookAtFlags" />
         <add name="Look At Name" type="string" />
         <add name="Driven Name" type="string" />
@@ -7204,7 +7206,7 @@
         <add name="Interpolator: Scale" type="Ref" template="NiFloatInterpolator" />
     </niobject>
 
-    <niobject name="NiPathEvaluator" inherit="NiKeyBasedEvaluator">
+    <niobject name="NiPathEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
         <add name="Flags" type="PathFlags" default="3" />
         <add name="Bank Dir" type="int" default="1">-1 = Negative, 1 = Positive</add>
         <add name="Max Bank Angle" type="float">Max angle in radians.</add>
@@ -7214,7 +7216,7 @@
         <add name="Percent Data" type="Ref" template="NiFloatData" />
     </niobject>
 
-    <niobject name="NiSequenceData" inherit="NiObject">
+    <niobject name="NiSequenceData" inherit="NiObject" since="V20_5_0_0">
         Root node in Gamebryo .kf files (20.5.0.1 and up).
         For 20.5.0.0, "NiSequenceData" is an alias for "NiControllerSequence" and this is not handled in nifxml.
         This was not found in any 20.5.0.0 KFs available and they instead use NiControllerSequence directly.
@@ -7260,7 +7262,7 @@
     </niobject>
 
     <!-- Divinity 2 -->
-    <niobject name="CStreamableAssetData" inherit="NiObject">
+    <niobject name="CStreamableAssetData" inherit="NiObject" versions="V20_3_0_9 V20_3_0_9_DIV2">
         <add name="Root" type="Ref" template="NiNode" />
         <add name="Has Data" type="bool" />
         <add name="Data" type="ByteArray" cond="Has Data" />
@@ -7372,7 +7374,7 @@
     
     <!-- Fallout 4 Geometry -->
     
-    <niobject name="BSTriShape" inherit="NiAVObject">
+    <niobject name="BSTriShape" inherit="NiAVObject" versions="V20_2_0_7_FO4 V20_2_0_7_SSE">
         Fallout 4 Tri Shape
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Skin" type="Ref" template="NiObject" />
@@ -7391,21 +7393,21 @@
         <add name="Triangles Copy" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" userver2="100" />
     </niobject>
 
-    <niobject name="BSMeshLODTriShape" inherit="BSTriShape">
+    <niobject name="BSMeshLODTriShape" inherit="BSTriShape" versions="V20_2_0_7_FO4">
         Fallout 4 LOD Tri Shape
         <add name="LOD0 Size" type="uint" />
         <add name="LOD1 Size" type="uint" />
         <add name="LOD2 Size" type="uint" />
     </niobject>
     
-    <compound name="BSGeometryPerSegmentSharedData">
+    <compound name="BSGeometryPerSegmentSharedData" versions="V20_2_0_7_FO4">
         <add name="User Index" type="uint">If Bone ID is 0xffffffff, this value refers to the Segment at the listed index. Otherwise this is the "Biped Object", which is like the body part types in Skyrim and earlier.</add>
         <add name="Bone ID" type="uint">A hash of the bone name string.</add>
         <add name="Num Cut Offsets" type="uint">Maximum of 8.</add>
         <add name="Cut Offsets" type="float" arr1="Num Cut Offsets" />
     </compound>
 
-    <compound name="BSGeometrySegmentSharedData">
+    <compound name="BSGeometrySegmentSharedData" versions="V20_2_0_7_FO4">
         <add name="Num Segments" type="uint" />
         <add name="Total Segments" type="uint" />
         <add name="Segment Starts" type="uint" arr1="Num Segments" />
@@ -7415,7 +7417,7 @@
         <add name="SSF File" type="byte" arr1="SSF Length" />
     </compound>
 
-    <niobject name="BSSubIndexTriShape" inherit="BSTriShape">
+    <niobject name="BSSubIndexTriShape" inherit="BSTriShape" versions="V20_2_0_7_FO4 V20_2_0_7_SSE">
         Fallout 4 Sub-Index Tri Shape
 		<add name="Num Primitives" type="uint" userver2="130" cond="Data Size &gt; 0" />
 		<add name="Num Segments" type="uint" userver2="130" cond="Data Size &gt; 0" />
@@ -7428,11 +7430,11 @@
     
     <!-- Fallout 4 Physics -->
 
-    <niobject name="bhkSystem" abstract="1" inherit="NiObject">
+    <niobject name="bhkSystem" abstract="1" inherit="NiObject" versions="V20_2_0_7_FO4">
         Fallout 4 Physics System
     </niobject>
     
-    <niobject name="bhkNPCollisionObject" inherit="NiCollisionObject">
+    <niobject name="bhkNPCollisionObject" inherit="NiCollisionObject" versions="V20_2_0_7_FO4">
         Fallout 4 Collision Object
         <add name="Flags" type="ushort">
             Due to inaccurate reporting in the CK the Reset and Sync On Update positions are a guess.
@@ -7442,28 +7444,28 @@
         <add name="Body ID" type="uint" />
     </niobject>
     
-    <niobject name="bhkPhysicsSystem" inherit="bhkSystem">
+    <niobject name="bhkPhysicsSystem" inherit="bhkSystem" versions="V20_2_0_7_FO4">
         Fallout 4 Collision System
         <add name="Binary Data" type="ByteArray" />
     </niobject>
 
-    <niobject name="bhkRagdollSystem" inherit="bhkSystem">
+    <niobject name="bhkRagdollSystem" inherit="bhkSystem" versions="V20_2_0_7_FO4">
         Fallout 4 Ragdoll System
         <add name="Binary Data" type="ByteArray" />
     </niobject>
 
-    <niobject name="BSExtraData" inherit="NiExtraData">
+    <niobject name="BSExtraData" inherit="NiExtraData" versions="V20_2_0_7_FO4">
         Fallout 4 Extra Data
     </niobject>
 
-    <niobject name="BSClothExtraData" inherit="BSExtraData">
+    <niobject name="BSClothExtraData" inherit="BSExtraData" versions="V20_2_0_7_FO4">
         Fallout 4 Cloth data
         <add name="Binary Data" type="ByteArray" />
     </niobject>
     
     <!-- Fallout 4 Skeleton -->
 
-    <compound name="BSSkinBoneTrans">
+    <compound name="BSSkinBoneTrans" versions="V20_2_0_7_FO4">
         Fallout 4 Bone Transform
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Rotation" type="Matrix33" />
@@ -7471,7 +7473,7 @@
         <add name="Scale" type="float" />
     </compound>
 
-    <niobject name="BSSkin::Instance" inherit="NiObject">
+    <niobject name="BSSkin::Instance" inherit="NiObject" versions="V20_2_0_7_FO4">
         Fallout 4 Skin Instance
         <add name="Skeleton Root" type="Ptr" template="NiAVObject" />
         <add name="Data" type="Ref" template="BSSkin::BoneData" />
@@ -7481,19 +7483,19 @@
         <add name="Unknown" type="Vector3" arr1="Num Unknown" />
     </niobject>
 
-    <niobject name="BSSkin::BoneData" inherit="NiObject">
+    <niobject name="BSSkin::BoneData" inherit="NiObject" versions="V20_2_0_7_FO4">
         Fallout 4 Bone Data
         <add name="Num Bones" type="uint" />
         <add name="Bone List" type="BSSkinBoneTrans" arr1="Num Bones" />
     </niobject>
 
-    <niobject name="BSPositionData" inherit="NiExtraData">
+    <niobject name="BSPositionData" inherit="NiExtraData" versions="V20_2_0_7_FO4">
         Fallout 4 Positional Data
         <add name="Num Data" type="uint" />
         <add name="Data" type="hfloat" arr1="Num Data" />
     </niobject>
 
-    <compound name="BSConnectPoint">
+    <compound name="BSConnectPoint" versions="V20_2_0_7_FO4">
         <add name="Parent" type="SizedString" default="WorkshopConnectPoints" />
         <add name="Name" type="SizedString" />
         <add name="Rotation" type="Quaternion" />
@@ -7501,32 +7503,32 @@
         <add name="Scale" type="float" default="1.0" />
     </compound>
 
-    <niobject name="BSConnectPoint::Parents" inherit="NiExtraData">
+    <niobject name="BSConnectPoint::Parents" inherit="NiExtraData" versions="V20_2_0_7_FO4">
         Fallout 4 Item Slot Parent
         <add name="Num Connect Points" type="uint" />
         <add name="Connect Points" type="BSConnectPoint" arr1="Num Connect Points" />
     </niobject>
 
-    <niobject name="BSConnectPoint::Children" inherit="NiExtraData">
+    <niobject name="BSConnectPoint::Children" inherit="NiExtraData" versions="V20_2_0_7_FO4">
         Fallout 4 Item Slot Child
         <add name="Skinned" type="bool" />
         <add name="Num Points" type="int" />
         <add name="Name" type="SizedString" arr1="Num Points" />
     </niobject>
     
-    <niobject name="BSEyeCenterExtraData" inherit="NiExtraData">
+    <niobject name="BSEyeCenterExtraData" inherit="NiExtraData" versions="V20_2_0_7_FO4">
         Fallout 4 Eye Center Data
         <add name="Num Data" type="int" />
         <add name="Data" type="float" arr1="Num Data" />
     </niobject>
 	
-    <compound name="BSPackedGeomDataCombined">
+    <compound name="BSPackedGeomDataCombined" versions="V20_2_0_7_FO4">
         <add name="Grayscale to Palette Scale" type="float" />
         <add name="Transform" type="NiTransform" />
         <add name="Bounding Sphere" type="NiBound" />
     </compound>
 
-    <compound name="BSPackedGeomData">
+    <compound name="BSPackedGeomData" versions="V20_2_0_7_FO4">
         <add name="Num Verts" type="uint" />
         <add name="LOD Levels" type="uint" />
         <add name="Tri Count LOD0" type="uint" />
@@ -7542,7 +7544,7 @@
         <add name="Triangles" type="Triangle" arr1="Tri Count LOD0 + Tri Count LOD1 + Tri Count LOD2" />
     </compound>
 
-    <compound name="BSPackedSharedGeomData">
+    <compound name="BSPackedSharedGeomData" versions="V20_2_0_7_FO4">
         <add name="Num Verts" type="uint" />
         <add name="LOD Levels" type="uint" />
         <add name="Tri Count LOD0" type="uint" />
@@ -7556,13 +7558,13 @@
         <add name="Vertex Desc" type="BSVertexDesc" />
     </compound>
 
-    <compound name="BSPackedGeomObject">
+    <compound name="BSPackedGeomObject" versions="V20_2_0_7_FO4">
         This appears to be a 64-bit hash but nif.xml does not have a 64-bit type.
         <add name="Shape ID 1" type="uint" />
         <add name="Shape ID 2" type="uint" />
     </compound>
 
-    <niobject name="BSPackedCombinedGeomDataExtra" inherit="NiExtraData">
+    <niobject name="BSPackedCombinedGeomDataExtra" inherit="NiExtraData" versions="V20_2_0_7_FO4">
         Fallout 4 Packed Combined Geometry Data.
         Geometry is baked into the file and given a list of transforms to position each copy.
         <add name="Vertex Desc" type="BSVertexDesc" />
@@ -7574,7 +7576,7 @@
         <add name="Object Data" type="BSPackedGeomData" arr1="Num Data" />
     </niobject>
 
-    <niobject name="BSPackedCombinedSharedGeomDataExtra" inherit="NiExtraData">
+    <niobject name="BSPackedCombinedSharedGeomDataExtra" inherit="NiExtraData" versions="V20_2_0_7_FO4">
         Fallout 4 Packed Combined Shared Geometry Data.
         Geometry is NOT baked into the file. It is instead a reference to the shape via a Shape ID (currently undecoded)
         which loads the geometry via the STAT form for the NIF.
@@ -7590,18 +7592,18 @@
 
     <!-- Fallout 4 Animation -->
     
-    <niobject name="NiLightRadiusController" inherit="NiFloatInterpController">
+    <niobject name="NiLightRadiusController" inherit="NiFloatInterpController" versions="V20_2_0_7_FO4">
     
     </niobject>
 	
 	<!-- Skyrim SE --> 
 
-	<niobject name="BSDynamicTriShape" inherit="BSTriShape">
+	<niobject name="BSDynamicTriShape" inherit="BSTriShape" versions="V20_2_0_7_SSE">
 		<add name="Vertex Data Size" type="uint" />
 		<add name="Vertices" type="Vector4" arr1="Num Vertices" cond="Vertex Data Size &gt; 0" />
 	</niobject>
 	
-	<niobject name="BSDistantObjectLargeRefExtraData" inherit="NiExtraData">
+	<niobject name="BSDistantObjectLargeRefExtraData" inherit="NiExtraData" versions="V20_2_0_7_SSE">
         Large ref flag.
 		<add name="Large Ref" type="bool" />
 	</niobject>

From 74c1aac63335ab60a4adb4a6c848ccebc255b8c6 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 31 May 2018 15:33:49 -0400
Subject: [PATCH 19/86] NiMesh DEM cleanup and decoding

Moved all the DEM specific stuff out of NiMesh and into compounds.  Did some decoding while I was at it.   There are many small customizations to other blocks for DEM, but I am not including them in this commit.  Regardless, the existing XML only worked for DEM1 and now at least some DEM2 will load fully.
---
 nif.xml | 76 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/nif.xml b/nif.xml
index 9bfe548..be0257f 100644
--- a/nif.xml
+++ b/nif.xml
@@ -6445,33 +6445,50 @@
         <add name="Complete Points" type="SyncPoint" arr1="Num Complete Points">The sync points supported by this mesh modifier for CompleteTasks.</add>
     </niobject>
 
-    <compound name="ExtraMeshDataEpicMickey">
-        <add name="Unknown Int 1" type="int" />
-        <add name="Unknown Int 2" type="int" />
-        <add name="Unknown Int 3" type="int" />
-        <add name="Unknown Int 4" type="float" />
-        <add name="Unknown Int 5" type="float" />
-        <add name="Unknown Int 6" type="float" />
+    <compound name="MeshDataEpicMickey" versions="V20_6_5_0_DEM">
+        <add name="Unknown 1" type="int" />
+        <add name="Unknown 2" type="int" />
+        <add name="Unknown 3" type="int" vercond="(User Version &gt; 14)" />
+        <add name="Unknown 4" type="int" />
+        <add name="Unknown 5" type="float" />
+        <add name="Unknown 6" type="int" />
+    </compound>
+
+    <compound name="WeightDataEpicMickey" versions="V20_6_5_0_DEM">
+        <add name="Bone Indices" type="int" arr1="3" />
+        <add name="Weights" type="float" arr1="3" />
     </compound>
 
-    <compound name="ExtraMeshDataEpicMickey2">
+    <compound name="PartitionDataEpicMickey" versions="V20_6_5_0_DEM">
         <add name="Start" type="int" />
         <add name="End" type="int" />
-        <add name="Unknown Shorts" type="short" arr1="10" />
+        <add name="Weight Indices" type="ushort" arr1="10" />
+    </compound>
+
+    <compound name="ExtraMeshDataEpicMickey" versions="V20_6_5_0_DEM">
+        <add name="Unknown 1" type="uint" />
+        <add name="Num Unk Floats" type="uint" />
+        <add name="Unk Floats 1" type="float" arr1="Num Unk Floats" />
+        <add name="Num Weights" type="uint" />
+        <add name="Weights" type="WeightDataEpicMickey" arr1="Num Weights" />
+        <add name="Vertex to Weight Map Size" type="uint" />
+        <add name="Vertex to Weight Map" type="uint" arr1="Vertex to Weight Map Size" />
+        <add name="Unknown Data Size" type="uint" />
+        <add name="Unknown Data Width" type="uint" />
+        <add name="Unknown Data" type="Vector3" arr1="Unknown Data Size" arr2="Unknown Data Width" />
+        <add name="Unknown Indices" type="ushort" arr1="Unknown Data Size" />
+        <add name="Num Mapped Primitives" type="ushort" vercond="(User Version &lt; 17)">When non-zero, equal to the number of primitives.</add>
+        <add name="Num Mapped Primitives" type="uint" userver="17">When non-zero, equal to the number of primitives.</add>
+        <add name="Mapped Primitives" type="byte" arr1="Num Mapped Primitives">Some integer associated with each primitive.</add>
+        <add name="Partition Size" type="uint" />
+        <add name="Partitions" type="PartitionDataEpicMickey" arr1="Partition Size" />
+        <add name="Max Primitive Map Index" type="uint">The max value to appear in the Mapped Primitives array.</add>
     </compound>
 
     <niobject name="NiMesh" inherit="NiRenderObject" since="V20_5_0_0">
         <add name="Primitive Type" type="MeshPrimitiveType">The primitive type of the mesh, such as triangles or lines.</add>
-
-        <!-- start: epic mickey (user version 15) unknowns -->
-        <add name="Unknown 51" type="int" userver="15" /><!-- could also be some other type -->
-        <add name="Unknown 52" type="int" userver="15" /><!-- could also be some other type -->
-        <add name="Unknown 53" type="int" userver="15" /><!-- could also be some other type -->
-        <add name="Unknown 54" type="int" userver="15" /><!-- could also be some other type -->
-        <add name="Unknown 55" type="float" userver="15" /><!-- could also be some other type -->
-        <add name="Unknown 56" type="int" userver="15" /><!-- could also be some other type -->
-        <!-- end: epic mickey (user version 15) unknowns -->
-
+        <!-- Epic Mickey -->
+        <add name="EM Data" type="MeshDataEpicMickey" ver1="20.6.5.0" ver2="20.6.5.0" />
         <add name="Num Submeshes" type="ushort">The number of submeshes contained in this mesh.</add>
         <add name="Instancing Enabled" type="bool">Sets whether hardware instancing is being used.</add>
         <add name="Bound" type="NiBound">The combined bounding volume of all submeshes.</add>
@@ -6479,24 +6496,9 @@
         <add name="Datastreams" type="DataStreamRef" arr1="Num Datastreams" />
         <add name="Num Modifiers" type="uint" />
         <add name="Modifiers" type="Ref" template="NiMeshModifier" arr1="Num Modifiers" />
-
-        <!-- start: epic mickey (user version 15) unknowns -->
-        <add name="Unknown 100" type="byte" userver="15">Unknown.</add>
-        <add name="Unknown 101" type="int" userver="15">Unknown.</add>
-        <add name="Unknown 102" type="uint" userver="15">Size of additional data.</add>
-        <add name="Unknown 103" type="float" arr1="Unknown 102" userver="15" />
-        <add name="Unknown 200" type="int" userver="15" />
-        <add name="Unknown 201" type="ExtraMeshDataEpicMickey" arr1="Unknown 200" userver="15" />
-        <add name="Unknown 250" type="int" userver="15" />
-        <add name="Unknown 251" type="int" arr1="Unknown 250" userver="15" />
-        <add name="Unknown 300" type="int" userver="15" />
-        <add name="Unknown 301" type="short" userver="15" />
-        <add name="Unknown 302" type="int" userver="15" />
-        <add name="Unknown 303" type="byte" arr1="Unknown 302" userver="15" />
-        <add name="Unknown 350" type="int" userver="15" />
-        <add name="Unknown 351" type="ExtraMeshDataEpicMickey2" arr1="Unknown 350" userver="15" />
-        <add name="Unknown 400" type="int" userver="15" />
-        <!-- end: epic mickey (user version 15) unknowns -->
+        <!-- Epic Mickey -->
+        <add name="Has Extra EM Data" type="bool" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 9)" />
+        <add name="Extra EM Data" type="ExtraMeshDataEpicMickey" cond="Has Extra EM Data" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 9)" />
     </niobject>
 
     <niobject name="NiMorphWeightsController" inherit="NiInterpController" since="V20_5_0_0">

From 986bbc8b3c86671f14eedb446c3df9da34a8706f Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 31 May 2018 15:43:17 -0400
Subject: [PATCH 20/86] Added custom version 10.2.0.0, 1

Added V10_2_0_0__1 and scoped NiFurSpringController to it since it is a custom block only for that game.
---
 nif.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nif.xml b/nif.xml
index be0257f..d94581c 100644
--- a/nif.xml
+++ b/nif.xml
@@ -45,6 +45,7 @@
     <version id="V10_1_0_101" num="10.1.0.101" user="10" bsver="4">Oblivion</version>
     <version id="V10_1_0_106" num="10.1.0.106" user="10" bsver="5">Oblivion</version>
     <version id="V10_2_0_0" num="10.2.0.0" user="0">{{Pro Cycling Manager}}, {{Prison Tycoon}}, {{Red Ocean}}, {{Wildlife Park 2}}, Civilization IV, Loki</version>
+    <version id="V10_2_0_0__1" num="10.2.0.0" user="1">{{Blood Bowl}}</version>
     <version id="V10_2_0_0__10" num="10.2.0.0" user="10" bsver="6 7 8 9">Oblivion</version>
     <version id="V10_2_0_1" num="10.2.0.1" custom="true">Worldshift</version>
     <version id="V10_3_0_1" num="10.3.0.1" custom="true">Worldshift</version>
@@ -3134,7 +3135,7 @@
         <add name="Material Extra Data" type="int" arr1="Num Materials" ver1="20.2.0.5">Extra data associated with the material. A value of -1 means the material is the default implementation.</add>
         <add name="Active Material" type="int" default="-1" ver1="20.2.0.5">The index of the currently active material.</add>
         <!-- Custom Versions -->
-        <add name="Unknown Byte" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" userver="1">Cyanide extension (only in version 10.2.0.0?).</add>
+        <add name="Unknown Byte" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" userver="1">Cyanide extension (Blood Bowl).</add>
         <add name="Unknown Integer 2" type="int" ver1="10.3.0.1" ver2="10.4.0.1">Unknown.</add>
         <!-- / Custom -->
         <add name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</add>
@@ -7254,7 +7255,9 @@
         <add name="Directional Light Frustum Width" type="float" ver1="20.3.0.7" />
     </niobject>
 
-    <niobject name="NiFurSpringController" inherit="NiTimeController"><!-- BloodBowl -->
+    <niobject name="NiFurSpringController" inherit="NiTimeController" versions="V10_2_0_0__1">
+        Blood Bowl Specific
+        Used on things like hair/tails in conjunction with bones to animate them.
         <add name="Unknown Float" type="float"></add>
         <add name="Unknown Float 2" type="float"></add>
         <add name="Num Bones" type="uint">The number of node bones referenced as influences.</add>

From 90330d0bc7f5ae81d62016687121ffc309858798 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 1 Jun 2018 19:19:58 -0400
Subject: [PATCH 21/86] [Linting] Inherited duplicates

Fixed inherited duplicate names, as well as the layout of BSTriShape for Particle emitter geometry data in SSE.

Left the name for Dynamic Data as "Vertices" though it is technically just called "Dynamic Data" in engine.  It contains the vertices and bitangent X for any BSDynamicTriShape, so the naming is apt.
---
 nif.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nif.xml b/nif.xml
index d94581c..5f09ff0 100644
--- a/nif.xml
+++ b/nif.xml
@@ -7048,7 +7048,7 @@
         <add name="Prop" type="Ptr" template="NiPhysXPSParticleSystemProp" />
         <add name="Dest" type="Ptr" template="NiPhysXPSParticleSystemDest" />
         <add name="Scene" type="Ptr" template="NiPhysXScene" />
-        <add name="Flags" type="byte" />
+        <add name="PhysX Flags" type="byte" />
         <add name="Default Actor Pool Size" type="uint" />
         <add name="Generation Pool Size" type="uint" />
         <add name="Actor Pool Center" type="Vector3" />
@@ -7394,8 +7394,9 @@
         <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" userver2="100" />
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size &gt; 0" />
         <add name="Particle Data Size" type="uint" userver2="100" />
-        <add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" userver2="100" />
-        <add name="Triangles Copy" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" userver2="100" />
+        <add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" userver2="100" />
+        <add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" userver2="100" />
+        <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" userver2="100" />
     </niobject>
 
     <niobject name="BSMeshLODTriShape" inherit="BSTriShape" versions="V20_2_0_7_FO4">
@@ -7518,7 +7519,7 @@
         Fallout 4 Item Slot Child
         <add name="Skinned" type="bool" />
         <add name="Num Points" type="int" />
-        <add name="Name" type="SizedString" arr1="Num Points" />
+        <add name="Point Name" type="SizedString" arr1="Num Points" />
     </niobject>
     
     <niobject name="BSEyeCenterExtraData" inherit="NiExtraData" versions="V20_2_0_7_FO4">
@@ -7604,8 +7605,8 @@
 	<!-- Skyrim SE --> 
 
 	<niobject name="BSDynamicTriShape" inherit="BSTriShape" versions="V20_2_0_7_SSE">
-		<add name="Vertex Data Size" type="uint" />
-		<add name="Vertices" type="Vector4" arr1="Num Vertices" cond="Vertex Data Size &gt; 0" />
+		<add name="Dynamic Data Size" type="uint" />
+		<add name="Vertices" type="Vector4" arr1="Dynamic Data Size / 16" />
 	</niobject>
 	
 	<niobject name="BSDistantObjectLargeRefExtraData" inherit="NiExtraData" versions="V20_2_0_7_SSE">

From 1ee21f2d0dfa20b0c48924afd2f8daa91cb1d9c5 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 1 Jun 2018 20:18:34 -0400
Subject: [PATCH 22/86] NiObjectNET move old legacy info into compound

---
 nif.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nif.xml b/nif.xml
index 5f09ff0..9354581 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2729,15 +2729,20 @@
         <add name="Basis Data" type="Ref" template="NiBSplineBasisData" />
     </niobject>
 
+    <compound name="LegacyExtraData" until="V2_3">
+        Extra Data for pre-3.0 versions
+        <add name="Has Extra Data" type="bool" />
+        <add name="Extra Prop Name" cond="Has Extra Data" type="string" />
+        <add name="Extra Ref ID" cond="Has Extra Data" type="uint" />
+        <add name="Extra String" cond="Has Extra Data" type="string" />
+        <add name="Unknown Byte 1" type="byte" />
+    </compound>
+
     <niobject name="NiObjectNET" abstract="1" inherit="NiObject">
         Abstract base class for NiObjects that support names, extra data, and time controllers.
         <add name="Skyrim Shader Type" type="BSLightingShaderPropertyShaderType" vercond="User Version 2 &gt;= 83" cond="BSLightingShaderProperty">Configures the main shader path</add>
         <add name="Name" type="string">Name of this controllable object, used to refer to the object in .kf files.</add>
-        <add name="Has Old Extra Data" type="bool" ver2="2.3">Extra data for pre-3.0 versions.</add>
-        <add name="Old Extra Prop Name" cond="Has Old Extra Data" ver2="2.3" type="string">(=NiStringExtraData)</add>
-        <add name="Old Extra Internal Id" cond="Has Old Extra Data" ver2="2.3" type="uint">ref</add>
-        <add name="Old Extra String" cond="Has Old Extra Data" ver2="2.3" type="string">Extra string data.</add>
-        <add name="Unknown Byte" type="byte" ver2="2.3">Always 0.</add>
+        <add name="Legacy Extra Data" type="LegacyExtraData" ver2="2.3" />
         <add name="Extra Data" type="Ref" template="NiExtraData" ver1="3.0" ver2="4.2.2.0">Extra data object index. (The first in a chain)</add>
         <add name="Num Extra Data List" type="uint" ver1="10.0.1.0">The number of Extra Data objects referenced through the list.</add>
         <add name="Extra Data List" type="Ref" template="NiExtraData" arr1="Num Extra Data List" ver1="10.0.1.0">List of extra data indices.</add>

From dfaa8fc5ba0e7b74c3b36fc0485d28ea78e49a2b Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 1 Jun 2018 20:34:11 -0400
Subject: [PATCH 23/86] Rest of DEM block extensions

Added additional decoding from DEM decoding in 74c1aac since I erroneously added some of the decoding to NiPSParticleSystem in 1d62f16 anyway.

Did not decode any completely custom blocks.
---
 nif.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nif.xml b/nif.xml
index 9354581..54debb3 100644
--- a/nif.xml
+++ b/nif.xml
@@ -6626,8 +6626,8 @@
         <add name="Spawn Rate Keys" type="PSSpawnRateKey" arr1="Num Spawn Rate Keys" ver1="20.6.1.0" />
         <add name="Pre RPI" type="bool" ver1="20.6.1.0" />
         <!-- Epic Mickey -->
-        <add name="Unk Int" type="uint" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
-        <add name="Unk Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
+        <add name="DEM Unknown Int" type="uint" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
+        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
     </niobject>
 
     <niobject name="NiPSMeshParticleSystem" inherit="NiPSParticleSystem" since="V20_5_0_0">
@@ -6701,6 +6701,8 @@
         <add name="Shrink Time" type="float">The the amount of time over which a particle's size is ramped from 1.0 to 0.0 in seconds</add>
         <add name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</add>
         <add name="Shrink Generation" type="ushort">Specifies the particle generation to which the shrink effect should be applied. This is usually the highest supported generation for the particle system, so that particles will shrink immediately before getting killed.</add>
+        <!-- Epic Mickey -->
+        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
     </niobject>
 
     <niobject name="NiPSSimulatorForcesStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
@@ -6804,7 +6806,9 @@
 
     <niobject name="NiPSGravityFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of directional gravity.
+        <add name="DEM Unknown Short" type="ushort" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
         <add name="Direction" type="Vector3" />
+        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
     </niobject>
 
     <niobject name="NiPSDragFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
@@ -6857,6 +6861,8 @@
 
     <niobject name="NiPSVolumeEmitter" abstract="1" inherit="NiPSEmitter" since="V20_5_0_0">
         Abstract base class for particle emitters that emit particles from a volume.
+        <!-- Epic Mickey -->
+        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
         <add name="Emitter Object" type="Ptr" template="NiAVObject" />
     </niobject>
 

From 437817a29dabb384083b7efb11656727650d6be3 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 1 Jun 2018 20:40:36 -0400
Subject: [PATCH 24/86] [Linting] Unknown comments, descriptions

Removed redundant descriptions for unknown values, removed incorrect descriptions for previously unknown values.  Any custom extension unknowns were prefixed with their relevant game.  Anything that was "Unk" was changed to "Unknown" for consistency.

A few inherited duplicates were also fixed in the process.
---
 nif.xml | 396 ++++++++++++++++++++++++++------------------------------
 1 file changed, 184 insertions(+), 212 deletions(-)

diff --git a/nif.xml b/nif.xml
index 54debb3..425f06f 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1295,7 +1295,7 @@
         The distance range where a specific level of detail applies.
         <add name="Near Extent" type="float">Begining of range.</add>
         <add name="Far Extent" type="float">End of Range.</add>
-        <add name="Unknown Ints" type="uint" arr1="3" ver2="3.1">Unknown (0,0,0).</add>
+        <add name="Unknown Ints" type="uint" arr1="3" ver2="3.1" />
     </compound>
 
     <compound name="MatchGroup">
@@ -1525,7 +1525,7 @@
         <add name="Num Block Types" type="ushort" ver1="5.0.0.1">Number of object types in this NIF file.</add>
         <add name="Block Types" type="SizedString" arr1="Num Block Types" ver1="5.0.0.1">List of all object types used in this NIF file.</add>
         <add name="Block Type Index" type="BlockTypeIndex" arr1="Num Blocks" ver1="5.0.0.1">Maps file objects on their corresponding type: first file object is of type object_types[object_type_index[0]], the second of object_types[object_type_index[1]], etc.</add>
-        <add name="Block Size" type="uint" arr1="Num Blocks" ver1="20.2.0.5">Array of block sizes?</add>
+        <add name="Block Size" type="uint" arr1="Num Blocks" ver1="20.2.0.5">Array of block sizes</add>
         <add name="Num Strings" type="uint" ver1="20.1.0.1">Number of strings.</add>
         <add name="Max String Length" type="uint" ver1="20.1.0.1">Maximum string length.</add>
         <add name="Strings" type="SizedString" arr1="Num Strings" ver1="20.1.0.1">Strings.</add>
@@ -1601,7 +1601,7 @@
         <add name="UV Set" type="uint" default="0" ver2="20.0.0.5">The texture coordinate set in NiGeometryData that this texture slot will use.</add>
         <add name="PS2 L" type="short" default="0" ver2="10.4.0.1">L can range from 0 to 3 and are used to specify how fast a texture gets blurry.</add>
         <add name="PS2 K" type="short" default="-75" ver2="10.4.0.1">K is used as an offset into the mipmap levels and can range from -2047 to 2047. Positive values push the mipmap towards being blurry and negative values make the mipmap sharper.</add>
-        <add name="Unknown1" type="ushort" ver2="4.1.0.12">Unknown, 0 or 0x0101?</add>
+        <add name="Unknown Short 1" type="ushort" ver2="4.1.0.12" />
         <!-- NiTextureTransform -->
         <add name="Has Texture Transform" type="bool" default="false" ver1="10.1.0.0">Whether or not the texture coordinates are transformed.</add>
         <add name="Translation" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0">The UV translation.</add>
@@ -1708,7 +1708,7 @@
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="(Has Faces) &amp;&amp; (Num Strips == 0)" ver1="10.1.0.0">The triangles.</add>
         <add name="Has Bone Indices" type="bool">Do we have bone indices?</add>
         <add name="Bone Indices" type="byte" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Bone Indices">Bone indices, they index into 'Bones'.</add>
-		<add name="Unknown Short" type="ushort" vercond="User Version 2 &gt; 34">Unknown</add>
+		<add name="Unknown Short" type="ushort" vercond="User Version 2 &gt; 34" />
 		<add name="Vertex Desc" type="BSVertexDesc" ver="20.2.0.7" userver2="100" />
 		<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver="20.2.0.7" userver2="100" />
     </compound>
@@ -1723,7 +1723,7 @@
         A sphere.
         <add name="Center" type="Vector3">The sphere's center.</add>
         <add name="Radius" type="float">The sphere's radius.</add>
-        <add name="Unknown 13 Shorts" type="short" arr1="13" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
+        <add name="DIV2 13 Shorts" type="short" arr1="13" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
     </compound>
 
     <compound name="NiCurve3">
@@ -1771,8 +1771,8 @@
         <add name="Position Ref 1" type="byte" vercond="User Version 2 &lt;= 34">Refers to a furnituremarkerxx.nif file. Always seems to be the same as Position Ref 2.</add>
         <add name="Position Ref 2" type="byte" vercond="User Version 2 &lt;= 34">Refers to a furnituremarkerxx.nif file. Always seems to be the same as Position Ref 1.</add>
         <add name="Heading" type="float" vercond="User Version 2 &gt; 34">Similar to Orientation, in float form.</add>
-        <add name="Animation Type" type="AnimationType" vercond="User Version 2 &gt; 34">Unknown</add>
-        <add name="Entry Properties" type="FurnitureEntryPoints" vercond="User Version 2 &gt; 34">Unknown/unused in nif?</add>
+        <add name="Animation Type" type="AnimationType" vercond="User Version 2 &gt; 34" />
+        <add name="Entry Properties" type="FurnitureEntryPoints" vercond="User Version 2 &gt; 34" />
     </compound>
 
     <compound name="TriangleData">
@@ -1795,11 +1795,11 @@
     <compound name="Particle">
         particle array entry
         <add name="Velocity" type="Vector3">Particle velocity</add>
-        <add name="Unknown Vector" type="Vector3">Unknown</add>
+        <add name="Unknown Vector" type="Vector3" />
         <add name="Lifetime" type="float">The particle age.</add>
         <add name="Lifespan" type="float">Maximum age of the particle.</add>
         <add name="Timestamp" type="float">Timestamp of the last update.</add>
-        <add name="Unknown Short" type="ushort" default="0">Unknown short</add>
+        <add name="Unknown Short" type="ushort" default="0" />
         <add name="Vertex ID" type="ushort">Particle/vertex index matches array index</add>
     </compound>
 
@@ -2042,7 +2042,7 @@
         Used to store skin weights in NiTriShapeSkinController.
         <add name="Vertex Weight" type="float">The amount that this bone affects the vertex.</add>
         <add name="Vertex Index" type="ushort">The index of the vertex that this weight applies to.</add>
-        <add name="Unknown Vector" type="Vector3">Unknown.  Perhaps some sort of offset?</add>
+        <add name="Unknown Vector" type="Vector3" />
     </compound>
 
     <enum name="ImageType" storage="uint">
@@ -2139,7 +2139,7 @@
         <add name="Triangle 1" type="ushort" />
         <add name="Triangle 2" type="ushort" />
         <add name="Triangle 3" type="ushort" />
-        <add name="Material" type="uint">Always 0?</add>
+        <add name="Material" type="uint" />
         <add name="Welding Info" type="ushort" />
     </compound>
     
@@ -2210,43 +2210,43 @@
 
     <niobject name="Ni3dsAlphaAnimator" inherit="NiObject" versions="V2_3">
         Unknown.
-        <add name="Unknown 1" type="byte" arr1="40">Unknown.</add>
-        <add name="Parent" type="Ref" template="NiObject">The parent?</add>
-        <add name="Num 1" type="uint">Unknown.</add>
-        <add name="Num 2" type="uint">Unknown.</add>
-        <add name="Unknown 2" type="uint" arr1="Num 1" arr2="Num 2" arr3="2">Unknown.</add>
+        <add name="Unknown 1" type="byte" arr1="40" />
+        <add name="Parent" type="Ref" template="NiObject" />
+        <add name="Num 1" type="uint" />
+        <add name="Num 2" type="uint" />
+        <add name="Unknown 2" type="uint" arr1="Num 1" arr2="Num 2" arr3="2" />
     </niobject>
 
     <niobject name="Ni3dsAnimationNode" inherit="NiObject" versions="V2_3">
         Unknown. Only found in 2.3 nifs.
         <add name="Name" type="string">Name of this object.</add>
-        <add name="Has Data" type="bool">Unknown.</add>
-        <add name="Unknown Floats 1" type="float" arr1="21" cond="Has Data">Unknown. Matrix?</add>
-        <add name="Unknown Short" type="ushort" cond="Has Data">Unknown.</add>
-        <add name="Child" type="Ref" template="NiObject" cond="Has Data">Child?</add>
-        <add name="Unknown Floats 2" type="float" arr1="12" cond="Has Data">Unknown.</add>
+        <add name="Has Data" type="bool" />
+        <add name="Unknown Floats 1" type="float" arr1="21" cond="Has Data" />
+        <add name="Unknown Short" type="ushort" cond="Has Data" />
+        <add name="Child" type="Ref" template="NiObject" cond="Has Data" />
+        <add name="Unknown Floats 2" type="float" arr1="12" cond="Has Data" />
         <add name="Count" type="uint" cond="Has Data">A count.</add>
-        <add name="Unknown Array" type="byte" arr1="Count" arr2="5" cond="Has Data">Unknown.</add>
+        <add name="Unknown Array" type="byte" arr1="Count" arr2="5" cond="Has Data" />
     </niobject>
 
     <niobject name="Ni3dsColorAnimator" inherit="NiObject" versions="V2_3">
         Unknown!
-        <add name="Unknown 1" type="byte" arr1="184">Unknown.</add>
+        <add name="Unknown 1" type="byte" arr1="184" />
     </niobject>
 
     <niobject name="Ni3dsMorphShape" inherit="NiObject" versions="V2_3">
         Unknown!
-        <add name="Unknown 1" type="byte" arr1="14">Unknown.</add>
+        <add name="Unknown 1" type="byte" arr1="14" />
     </niobject>
 
     <niobject name="Ni3dsParticleSystem" inherit="NiObject" versions="V2_3">
         Unknown!
-        <add name="Unknown 1" type="byte" arr1="14">Unknown.</add>
+        <add name="Unknown 1" type="byte" arr1="14" />
     </niobject>
 
     <niobject name="Ni3dsPathController" inherit="NiObject" versions="V2_3">
         Unknown!
-        <add name="Unknown 1" type="byte" arr1="20">Unknown.</add>
+        <add name="Unknown 1" type="byte" arr1="20" />
     </niobject>
 
 
@@ -2324,7 +2324,7 @@
         <add name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT">How the body reacts to collisions. See hkResponseType for hkpWorld default implementations.</add>
         <add name="Unused Byte 1" type="byte">Skipped over when writing Collision Response and Callback Delay.</add>
         <add name="Process Contact Callback Delay" type="ushort" default="0xffff">Lowers the frequency for processContactCallbacks. A value of 5 means that a callback is raised every 5th frame. The default is once every 65535 frames.</add>
-        <add name="Unknown Int 1" type="uint" ver1="10.1.0.0">Unknown.</add>
+        <add name="Unknown Int 1" type="uint" ver1="10.1.0.0" />
         <add name="Havok Filter Copy" type="HavokFilter" ver1="10.1.0.0">Copy of Havok Filter</add>
         <add name="Unused 2" type="byte" arr1="4" ver1="10.1.0.0">Garbage data from memory. Matches previous Unused value.</add>
         <add name="Unknown Int 2" type="uint" ver1="10.1.0.0" vercond="User Version 2 &gt; 34" />
@@ -2367,8 +2367,8 @@
             A good choice is 5% - 20% of the smallest diameter of the object.
         </add>
         <add name="Unknown Float 1" type="float" vercond="(User Version 2 == 130)" />
-        <add name="Unknown Bytes 1" type="byte" arr1="12">Unknown.</add>
-        <add name="Unknown Bytes 2" type="byte" arr1="4" vercond="(User Version 2 &gt; 34)">Unknown. Skyrim only.</add>
+        <add name="Unknown Bytes 1" type="byte" arr1="12" />
+        <add name="Unknown Bytes 2" type="byte" arr1="4" vercond="(User Version 2 &gt; 34)" />
         <add name="Num Constraints" type="uint" />
         <add name="Constraints" type="Ref" template="bhkSerializable" arr1="Num Constraints" />
         <add name="Body Flags" type="uint" vercond="(User Version 2 &lt; 76)">1 = respond to wind</add>
@@ -2512,8 +2512,8 @@
 
     <niobject name="bhkMultiSphereShape" inherit="bhkSphereRepShape">
         Unknown.
-        <add name="Unknown Float 1" type="float">Unknown.</add>
-        <add name="Unknown Float 2" type="float">Unknown.</add>
+        <add name="Unknown Float 1" type="float" />
+        <add name="Unknown Float 2" type="float" />
         <add name="Num Spheres" type="uint">The number of spheres in this multi sphere shape.</add>
         <add name="Spheres" type="NiBound" arr1="Num Spheres">This array holds the spheres which make up the multi sphere shape.</add>
     </niobject>
@@ -2553,7 +2553,7 @@
         <add name="Child Shape Property" type="hkWorldObjCinfoProperty" />
         <add name="Child Filter Property" type="hkWorldObjCinfoProperty" />
         <add name="Num Unknown Ints" type="uint">Count.</add>
-        <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints">Unknown.</add>
+        <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" />
     </niobject>
 
     <!--
@@ -2797,8 +2797,8 @@
         Unknown.
         <add name="Heir Gain" type="float" />
         <add name="Vel Gain" type="float" />
-        <add name="Unk Float 1" type="float" vercond="User Version 2 &lt; 9" />
-        <add name="Unk Float 2" type="float" vercond="User Version 2 &lt; 9" />
+        <add name="Unknown Float 1" type="float" vercond="User Version 2 &lt; 9" />
+        <add name="Unknown Float 2" type="float" vercond="User Version 2 &lt; 9" />
     </niobject>
 
     <niobject name="bhkPCollisionObject" inherit="bhkNiCollisionObject">
@@ -2819,8 +2819,8 @@
         <add name="Velocity" type="Vector3" ver2="4.2.2.0">Unknown function. Always seems to be (0, 0, 0)</add>
         <add name="Num Properties" type="uint" vercond="(User Version 2 &lt;= 34)" />
         <add name="Properties" type="Ref" template="NiProperty" arr1="Num Properties" vercond="(User Version 2 &lt;= 34)">All rendering properties attached to this object.</add>
-        <add name="Unknown 1" type="uint" arr1="4" ver2="2.3">Always 2,0,2,0.</add>
-        <add name="Unknown 2" type="byte" ver2="2.3">0 or 1.</add>
+        <add name="Unknown 1" type="uint" arr1="4" ver2="2.3" />
+        <add name="Unknown 2" type="byte" ver2="2.3" />
         <add name="Has Bounding Volume" type="bool" ver1="3.0" ver2="4.2.2.0" />
         <add name="Bounding Volume" type="BoundingVolume" cond="Has Bounding Volume" ver1="3.0" ver2="4.2.2.0" />
         <add name="Collision Object" type="Ref" template="NiCollisionObject" ver1="10.0.1.0" />
@@ -2851,7 +2851,7 @@
 
     <niobject name="NiTransparentProperty" inherit="NiProperty">
         Unknown
-        <add name="Unknown" type="byte" arr1="6">Unknown.</add>
+        <add name="Unknown" type="byte" arr1="6" />
     </niobject>
 
     <niobject name="NiPSysModifier" abstract="1" inherit="NiObject">
@@ -2900,7 +2900,7 @@
         <add name="Start Time" type="float" default="3.402823466e+38">Controller start time.</add>
         <add name="Stop Time" type="float" default="-3.402823466e+38">Controller stop time.</add>
         <add name="Target" type="Ptr" template="NiObjectNET" ver1="3.3.0.13">Controller target (object index of the first controllable ancestor of this object).</add>
-        <add name="Unknown Integer" type="uint" ver2="3.1">Unknown integer.</add>
+        <add name="Unknown Integer" type="uint" ver2="3.1" />
     </niobject>
 
 
@@ -2925,7 +2925,7 @@
         <add name="Interpolators" type="Ref" template="NiInterpolator" arr1="Num Interpolators" ver1="10.1.0.106" ver2="20.0.0.5" />
         <add name="Interpolator Weights" type="MorphWeight" arr1="Num Interpolators" ver1="20.1.0.3" />
         <add name="Num Unknown Ints" type="uint" ver1="10.2.0.0" ver2="20.0.0.5" vercond="(User Version 2 &gt; 9)" />
-        <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" ver1="10.2.0.0" ver2="20.0.0.5" vercond="(User Version 2 &gt; 9)">Unknown.</add>
+        <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" ver1="10.2.0.0" ver2="20.0.0.5" vercond="(User Version 2 &gt; 9)" />
     </niobject>
 
     <niobject name="NiMorphController" inherit="NiInterpController">
@@ -3092,8 +3092,8 @@
         Animates an NiFloatExtraData object attached to an NiAVObject.
         NiInterpController::GetCtlrID() string format is same as parent.
         <add name="Num Extra Bytes" type="byte" ver2="10.1.0.0">Number of extra bytes.</add>
-        <add name="Unknown Bytes" type="byte" arr1="7" ver2="10.1.0.0">Unknown.</add>
-        <add name="Unknown Extra Bytes" type="byte" arr1="Num Extra Bytes" ver2="10.1.0.0">Unknown.</add>
+        <add name="Unknown Bytes" type="byte" arr1="7" ver2="10.1.0.0" />
+        <add name="Unknown Extra Bytes" type="byte" arr1="Num Extra Bytes" ver2="10.1.0.0" />
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
@@ -3117,7 +3117,7 @@
     <niobject name="NiBoneLODController" inherit="NiTimeController">
         DEPRECATED (20.5), Replaced by NiSkinningLODController.
         Level of detail controller for bones.  Priority is arranged from low to high.
-        <add name="LOD" type="uint">Unknown.</add>
+        <add name="LOD" type="uint" />
         <add name="Num LODs" type="uint">Number of LODs.</add>
         <add name="Num Node Groups" type="uint">Number of node arrays.</add>
         <add name="Node Groups" type="NodeSet" arr1="Num LODs">A list of node sets (each set a sequence of bones).</add>
@@ -3140,8 +3140,8 @@
         <add name="Material Extra Data" type="int" arr1="Num Materials" ver1="20.2.0.5">Extra data associated with the material. A value of -1 means the material is the default implementation.</add>
         <add name="Active Material" type="int" default="-1" ver1="20.2.0.5">The index of the currently active material.</add>
         <!-- Custom Versions -->
-        <add name="Unknown Byte" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" userver="1">Cyanide extension (Blood Bowl).</add>
-        <add name="Unknown Integer 2" type="int" ver1="10.3.0.1" ver2="10.4.0.1">Unknown.</add>
+        <add name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" userver="1">Cyanide extension (Blood Bowl).</add>
+        <add name="WorldShift Unknown" type="int" ver1="10.3.0.1" ver2="10.4.0.1" />
         <!-- / Custom -->
         <add name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</add>
     </compound>
@@ -3220,7 +3220,7 @@
         <add name="Num Vertices" type="ushort" cond="NiPSysData" vercond="(User Version 2 &lt; 34)">Number of vertices.</add>
         <add name="BS Max Vertices" type="ushort" cond="NiPSysData" vercond="(User Version 2 &gt;= 34)">Bethesda uses this for max number of particles in NiPSysData.</add>
         <add name="Keep Flags" type="byte" ver1="10.1.0.0">Used with NiCollision objects when OBB or TRI is set.</add>
-        <add name="Compress Flags" type="byte" ver1="10.1.0.0">Unknown.</add>
+        <add name="Compress Flags" type="byte" ver1="10.1.0.0" />
         <add name="Has Vertices" type="bool" default="1">Is the vertex array present? (Always non-zero.)</add>
         <add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Has Vertices">The mesh vertices.</add>
         <add name="Vector Flags" type="VectorFlags" ver1="10.0.1.0" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
@@ -3230,8 +3230,8 @@
         <add name="Normals" type="Vector3" arr1="Num Vertices" cond="Has Normals">The lighting normals.</add>
         <add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Tangent vectors.</add>
         <add name="Bitangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Bitangent vectors.</add>
-        <add name="Has Unk Floats" type="bool" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
-        <add name="Unk Floats" type="float" arr1="Num Vertices" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" cond="Has Unk Floats" />
+        <add name="Has DIV2 Floats" type="bool" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
+        <add name="DIV2 Floats" type="float" arr1="Num Vertices" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" cond="Has DIV2 Floats" />
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Has Vertex Colors" type="bool">
             Do we have vertex colors? These are usually used to fine-tune the lighting of the model.
@@ -3249,7 +3249,7 @@
         </add>
         <add name="UV Sets" type="TexCoord" arr1="((Num UV Sets &amp; 63) | (Vector Flags &amp; 63) | (BS Vector Flags &amp; 1))" arr2="Num Vertices">The UV texture coordinates. They follow the OpenGL standard: some programs may require you to flip the second coordinate.</add>
         <add name="Consistency Flags" type="ConsistencyType" ver1="10.0.1.0" default="CT_MUTABLE">Consistency Flags</add>
-        <add name="Additional Data" type="Ref" template="AbstractAdditionalGeometryData" ver1="20.0.0.4">Unknown.</add>
+        <add name="Additional Data" type="Ref" template="AbstractAdditionalGeometryData" ver1="20.0.0.4" />
     </niobject>
 
     <niobject name="AbstractAdditionalGeometryData" abstract="1" inherit="NiObject">
@@ -3273,8 +3273,8 @@
 
     <niobject name="BSFurnitureMarker" inherit="NiExtraData">
         Unknown. Marks furniture sitting positions?
-        <add name="Num Positions" type="uint">Number of positions.</add>
-        <add name="Positions" type="FurniturePosition" arr1="Num Positions">Unknown. Probably has something to do with the furniture positions?</add>
+        <add name="Num Positions" type="uint" />
+        <add name="Positions" type="FurniturePosition" arr1="Num Positions" />
     </niobject>
 
     <niobject name="BSParentVelocityModifier" inherit="NiPSysModifier">
@@ -3296,7 +3296,7 @@
         <add name="Num Triangles" type="uint" />
         <add name="Triangles" type="TriangleData" arr1="Num Triangles" />
         <add name="Num Vertices" type="uint" />
-        <add name="Unknown Byte 1" type="byte" ver1="20.2.0.7">Unknown.</add>
+        <add name="Unknown Byte 1" type="byte" ver1="20.2.0.7" />
         <add name="Vertices" type="Vector3" arr1="Num Vertices" />
         <add name="Num Sub Shapes" type="ushort" ver1="20.2.0.7">Number of subparts.</add>
         <add name="Sub Shapes" type="OblivionSubShape" arr1="Num Sub Shapes" ver1="20.2.0.7">The subparts.</add>
@@ -3336,8 +3336,8 @@
             111 GL_NEVER
         </add>
         <add name="Threshold" type="byte" default="128">Threshold for alpha testing (see: glAlphaFunc)</add>
-        <add name="Unknown Short 1" type="ushort" ver2="2.3">Unknown</add>
-        <add name="Unknown Int 2" type="uint" ver2="2.3">Unknown</add>
+        <add name="Unknown Short 1" type="ushort" ver2="2.3" />
+        <add name="Unknown Int 2" type="uint" ver2="2.3" />
     </niobject>
 
     <niobject name="NiAmbientLight" inherit="NiLight">
@@ -3386,12 +3386,12 @@
 
     <compound name="ParticleDesc">
         Particle Description.
-        <add name="Translation" type="Vector3">Unknown.</add>
-        <add name="Unknown Floats 1" type="float" arr1="3" ver2="10.4.0.1">Unknown.</add>
-        <add name="Unknown Float 1" type="float" default="0.9">Unknown.</add>
-        <add name="Unknown Float 2" type="float" default="0.9">Unknown.</add>
-        <add name="Unknown Float 3" type="float" default="3.0">Unknown.</add>
-        <add name="Unknown Int 1" type="int">Unknown.</add>
+        <add name="Translation" type="Vector3" />
+        <add name="Unknown Floats 1" type="float" arr1="3" ver2="10.4.0.1" />
+        <add name="Unknown Float 1" type="float" default="0.9" />
+        <add name="Unknown Float 2" type="float" default="0.9" />
+        <add name="Unknown Float 3" type="float" default="3.0" />
+        <add name="Unknown Int 1" type="int" />
     </compound>
 
     <niobject name="NiPSysData" inherit="NiParticlesData">
@@ -3420,22 +3420,22 @@
 
     <niobject name="NiBinaryVoxelExtraData" inherit="NiExtraData" until="V3_1">
         Voxel extra data object.
-        <add name="Unknown Int" type="uint" default="0">Unknown.  0?</add>
-        <add name="Data" type="Ref" template="NiBinaryVoxelData">Link to binary voxel data.</add>
+        <add name="Unknown Int" type="uint" default="0" />
+        <add name="Data" type="Ref" template="NiBinaryVoxelData" />
     </niobject>
 
     <niobject name="NiBinaryVoxelData" inherit="NiObject" until="V3_1">
         Voxel data object.
-        <add name="Unknown Short 1" type="ushort">Unknown.</add>
-        <add name="Unknown Short 2" type="ushort">Unknown.</add>
-        <add name="Unknown Short 3" type="ushort">Unknown. Is this^3 the Unknown Bytes 1 size?</add>
-        <add name="Unknown 7 Floats" type="float" arr1="7">Unknown.</add>
-        <add name="Unknown Bytes 1" type="byte" arr1="7" arr2="12">Unknown. Always a multiple of 7.</add>
-        <add name="Num Unknown Vectors" type="uint">Unknown.</add>
-        <add name="Unknown Vectors" type="Vector4" arr1="Num Unknown Vectors">Vectors on the unit sphere.</add>
-        <add name="Num Unknown Bytes 2" type="uint">Unknown.</add>
-        <add name="Unknown Bytes 2" type="byte" arr1="Num Unknown Bytes 2">Unknown.</add>
-        <add name="Unknown 5 Ints" type="uint" arr1="5">Unknown.</add>
+        <add name="Unknown Short 1" type="ushort" />
+        <add name="Unknown Short 2" type="ushort" />
+        <add name="Unknown Short 3" type="ushort" />
+        <add name="Unknown 7 Floats" type="float" arr1="7" />
+        <add name="Unknown Bytes 1" type="byte" arr1="7" arr2="12" />
+        <add name="Num Unknown Vectors" type="uint" />
+        <add name="Unknown Vectors" type="Vector4" arr1="Num Unknown Vectors" />
+        <add name="Num Unknown Bytes 2" type="uint" />
+        <add name="Unknown Bytes 2" type="byte" arr1="Num Unknown Bytes 2" />
+        <add name="Unknown 5 Ints" type="uint" arr1="5" />
     </niobject>
 
     <niobject name="NiBlendBoolInterpolator" inherit="NiBlendInterpolator">
@@ -3545,7 +3545,7 @@
         <add name="Scene" type="Ref" template="NiAVObject" />
         <add name="Num Screen Polygons" type="uint" default="0">Deprecated. Array is always zero length on disk write.</add>
         <add name="Num Screen Textures" type="uint" default="0" ver1="4.2.1.0">Deprecated. Array is always zero length on disk write.</add>
-        <add name="Unknown Int 3" type="uint" ver2="3.1">Unknown.</add>
+        <add name="Unknown Int 3" type="uint" ver2="3.1" />
     </niobject>
 
     <niobject name="NiColorData" inherit="NiObject">
@@ -3571,9 +3571,9 @@
         <add name="Name" type="string">The sequence name by which the animation system finds and manages this sequence.</add>
         <add name="Accum Root Name" type="string" ver2="10.1.0.103">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
         <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver2="10.1.0.103" />
-        <add name="Num Unknown Ints" type="int" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)">Divinity 2</add>
-        <add name="Unknown Ints" type="int" arr1="Num Unknown Ints" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)">Divinity 2</add>
-        <add name="Unknown Ref" type="Ref" template="NiObject" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)">Divinity 2</add>
+        <add name="Num DIV2 Ints" type="int" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
+        <add name="DIV2 Ints" type="int" arr1="Num DIV2 Ints" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
+        <add name="DIV2 Ref" type="Ref" template="NiObject" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
         <add name="Num Controlled Blocks" type="uint" />
         <add name="Array Grow By" type="uint" ver1="10.1.0.106" />
         <add name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" />
@@ -3655,7 +3655,7 @@
 
     <niobject name="NiGravity" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier. Applies a gravitational field on the particles.
-        <add name="Unknown Float 1" type="float" ver1="3.3.0.13">Unknown.</add>
+        <add name="Unknown Float 1" type="float" ver1="3.3.0.13" />
         <add name="Force" type="float">The strength/force of this gravity.</add>
         <add name="Type" type="FieldType">The force field type.</add>
         <add name="Position" type="Vector3">The position of the mass point relative to the particle system.</add>
@@ -3771,8 +3771,8 @@
 
     <niobject name="FxWidget" inherit="NiNode" versions="V10_0_1_0">
         Firaxis-specific UI widgets?
-        <add name="Unknown 3" type="byte">Unknown.</add>
-        <add name="Unknown 292 Bytes" type="byte" arr1="292">Looks like 9 links and some string data.</add>
+        <add name="Unknown 3" type="byte" />
+        <add name="Unknown 292 Bytes" type="byte" arr1="292" />
     </niobject>
 
     <niobject name="FxButton" inherit="FxWidget" versions="V10_0_1_0">
@@ -3781,9 +3781,9 @@
 
     <niobject name="FxRadioButton" inherit="FxWidget" versions="V10_0_1_0">
         Unknown.
-        <add name="Unknown Int 1" type="uint">Unknown.</add>
-        <add name="Unknown Int 2" type="uint">Unknown.</add>
-        <add name="Unknown Int 3" type="uint">Unknown.</add>
+        <add name="Unknown Int 1" type="uint" />
+        <add name="Unknown Int 2" type="uint" />
+        <add name="Unknown Int 3" type="uint" />
         <add name="Num Buttons" type="uint">Number of unknown links.</add>
         <add name="Buttons" type="Ptr" template="FxRadioButton" arr1="Num Buttons">Unknown pointers to other buttons.  Maybe other buttons in a group so they can be switch off if this one is switched on?</add>
     </niobject>
@@ -3898,7 +3898,7 @@
 
     <niobject name="NiParticleMeshesData" inherit="NiRotatingParticlesData" until="V10_0_1_0">
         LEGACY (pre-10.1). Particle meshes data.
-        <add name="Unknown Link 2" type="Ref" template="NiAVObject">Refers to the mesh that makes up a particle?</add>
+        <add name="Unknown Link 2" type="Ref" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiParticleSystem" inherit="NiParticles">
@@ -3933,12 +3933,12 @@
         <add name="Vertical Angle" type="float">emitter's vertical opening angle [radians]</add>
         <add name="Horizontal Direction" type="float">horizontal emit direction</add>
         <add name="Horizontal Angle" type="float">emitter's horizontal opening angle</add>
-        <add name="Unknown Normal" type="Vector3">Unknown.</add>
-        <add name="Unknown Color" type="Color4">Unknown.</add>
+        <add name="Unknown Normal" type="Vector3" />
+        <add name="Unknown Color" type="Color4" />
         <add name="Size" type="float">Particle size</add>
         <add name="Emit Start Time" type="float">Particle emit start time</add>
         <add name="Emit Stop Time" type="float">Particle emit stop time</add>
-        <add name="Unknown Byte" type="byte" ver1="4.0.0.2">Unknown byte, (=0)</add>
+        <add name="Unknown Byte" type="byte" ver1="4.0.0.2" />
         <add name="Old Emit Rate" type="uint" ver2="3.1">Particle emission rate in old files</add>
         <add name="Emit Rate" type="float" ver1="3.3.0.13">Particle emission rate (particles per second)</add>
         <add name="Lifetime" type="float">Particle lifetime</add>
@@ -3946,14 +3946,14 @@
         <add name="Emit Flags" type="ushort" ver1="4.0.0.2">Bit 0: Emit Rate toggle bit (0 = auto adjust, 1 = use Emit Rate value)</add>
         <add name="Start Random" type="Vector3">Particle random start translation vector</add>
         <add name="Emitter" type="Ptr" template="NiObject">This index targets the particle emitter object (TODO: find out what type of object this refers to).</add>
-        <add name="Unknown Short 2" type="ushort" ver1="4.0.0.2">? short=0 ?</add>
-        <add name="Unknown Float 13" type="float" ver1="4.0.0.2">? float=1.0 ?</add>
-        <add name="Unknown Int 1" type="uint" ver1="4.0.0.2">? int=1 ?</add>
-        <add name="Unknown Int 2" type="uint" ver1="4.0.0.2">? int=0 ?</add>
-        <add name="Unknown Short 3" type="ushort" ver1="4.0.0.2">? short=0 ?</add>
+        <add name="Unknown Short 2" type="ushort" ver1="4.0.0.2" />
+        <add name="Unknown Float 13" type="float" ver1="4.0.0.2" />
+        <add name="Unknown Int 1" type="uint" ver1="4.0.0.2" />
+        <add name="Unknown Int 2" type="uint" ver1="4.0.0.2" />
+        <add name="Unknown Short 3" type="ushort" ver1="4.0.0.2" />
         <!-- <add name="Particle" type="Particle" ver2="3.1">The particle (older NIF versions only have a single particle per controller?)</add> -->
         <add name="Particle Velocity" type="Vector3" ver2="3.1">Particle velocity</add>
-        <add name="Particle Unknown Vector" type="Vector3" ver2="3.1">Unknown</add>
+        <add name="Particle Unknown Vector" type="Vector3" ver2="3.1" />
         <add name="Particle Lifetime" type="float" ver2="3.1">The particle's age.</add>
         <add name="Particle Link" type="Ref" template="NiObject" ver2="3.1" />
         <add name="Particle Timestamp" type="uint" ver2="3.1">Timestamp of the last update.</add>
@@ -3963,9 +3963,9 @@
         <add name="Num Particles" type="ushort" ver1="4.0.0.2">Size of the following array. (Maximum number of simultaneous active particles)</add>
         <add name="Num Valid" type="ushort" ver1="4.0.0.2">Number of valid entries in the following array. (Number of active particles at the time the system was saved)</add>
         <add name="Particles" type="Particle" arr1="Num Particles" ver1="4.0.0.2">Individual particle modifiers?</add>
-        <add name="Unknown Link" type="Ref" template="NiObject" ver1="4.0.0.2">unknown int (=0xffffffff)</add>
+        <add name="Unknown Link" type="Ref" template="NiObject" ver1="4.0.0.2" />
         <add name="Particle Extra" type="Ref" template="NiParticleModifier">Link to some optional particle modifiers (NiGravity, NiParticleGrowFade, NiParticleBomb, ...)</add>
-        <add name="Unknown Link 2" type="Ref" template="NiObject">Unknown int (=0xffffffff)</add>
+        <add name="Unknown Link 2" type="Ref" template="NiObject" />
         <add name="Trailer" type="byte" ver1="4.0.0.2">Trailing null byte</add>
         <add name="Color Data" type="Ref" template="NiColorData" ver2="3.1" />
         <add name="Unknown Float 1" type="float" ver2="3.1" />
@@ -4052,24 +4052,24 @@
 
     <niobject name="NiPlanarCollider" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Unknown Short" type="ushort" ver1="10.0.1.0">Usually 0?</add>
-        <add name="Unknown Float 1" type="float">Unknown.</add>
-        <add name="Unknown Float 2" type="float">Unknown.</add>
-        <add name="Unknown Short 2" type="ushort" ver1="4.2.2.0" ver2="4.2.2.0">Unknown.</add>
-        <add name="Unknown Float 3" type="float">Unknown.</add>
-        <add name="Unknown Float 4" type="float">Unknown.</add>
-        <add name="Unknown Float 5" type="float">Unknown.</add>
-        <add name="Unknown Float 6" type="float">Unknown.</add>
-        <add name="Unknown Float 7" type="float">Unknown.</add>
-        <add name="Unknown Float 8" type="float">Unknown.</add>
-        <add name="Unknown Float 9" type="float">Unknown.</add>
-        <add name="Unknown Float 10" type="float">Unknown.</add>
-        <add name="Unknown Float 11" type="float">Unknown.</add>
-        <add name="Unknown Float 12" type="float">Unknown.</add>
-        <add name="Unknown Float 13" type="float">Unknown.</add>
-        <add name="Unknown Float 14" type="float">Unknown.</add>
-        <add name="Unknown Float 15" type="float">Unknown.</add>
-        <add name="Unknown Float 16" type="float">Unknown.</add>
+        <add name="Unknown Short" type="ushort" ver1="10.0.1.0" />
+        <add name="Unknown Float 1" type="float" />
+        <add name="Unknown Float 2" type="float" />
+        <add name="Unknown Short 2" type="ushort" ver1="4.2.2.0" ver2="4.2.2.0" />
+        <add name="Unknown Float 3" type="float" />
+        <add name="Unknown Float 4" type="float" />
+        <add name="Unknown Float 5" type="float" />
+        <add name="Unknown Float 6" type="float" />
+        <add name="Unknown Float 7" type="float" />
+        <add name="Unknown Float 8" type="float" />
+        <add name="Unknown Float 9" type="float" />
+        <add name="Unknown Float 10" type="float" />
+        <add name="Unknown Float 11" type="float" />
+        <add name="Unknown Float 12" type="float" />
+        <add name="Unknown Float 13" type="float" />
+        <add name="Unknown Float 14" type="float" />
+        <add name="Unknown Float 15" type="float" />
+        <add name="Unknown Float 16" type="float" />
     </niobject>
 
     <niobject name="NiPointLight" inherit="NiLight">
@@ -4254,7 +4254,7 @@
         <add name="Percentage Spawned" type="float" default="1.0">The likelihood of a particular particle being spawned. Must be between 0.0 and 1.0.</add>
         <add name="Min Num to Spawn" type="ushort" default="1">The minimum particles to spawn for any given original particle.</add>
         <add name="Max Num to Spawn" type="ushort" default="1">The maximum particles to spawn for any given original particle.</add>
-        <add name="Unknown Int" type="int" ver1="10.2.0.1" ver2="10.4.0.1">WorldShift</add>
+        <add name="WorldShift Unknown Int" type="int" ver1="10.2.0.1" ver2="10.4.0.1" />
         <add name="Spawn Speed Variation" type="float">How much the spawned particle speed can vary.</add>
         <add name="Spawn Dir Variation" type="float">How much the spawned particle direction can vary.</add>
         <add name="Life Span" type="float">Lifespan assigned to spawned particles.</add>
@@ -4263,8 +4263,8 @@
 
     <!-- WorldShift -->
     <niobject name="NiPSysPartSpawnModifier" inherit="NiPSysModifier" versions="V10_2_0_1 V10_3_0_1 V10_4_0_1">
-        <add name="Unk Float 1" type="float" />
-        <add name="Unk Float 2" type="float" />
+        <add name="Unknown Float 1" type="float" />
+        <add name="Unknown Float 2" type="float" />
         <add name="Spawner" type="Ref" template="NiPSysSpawnModifier" />
     </niobject>
 
@@ -4381,17 +4381,17 @@
     
     <niobject name="NiPSysTrailEmitter" inherit="NiPSysEmitter">
         Guild 2-Specific node
-        <add name="Unknown Int 1" type="int">Unknown</add>
-        <add name="Unknown Float 1" type="float">Unknown</add>
-        <add name="Unknown Float 2" type="float">Unknown</add>
-        <add name="Unknown Float 3" type="float">Unknown</add>
-        <add name="Unknown Int 2" type="int">Unknown</add>
-        <add name="Unknown Float 4" type="float">Unknown</add>
-        <add name="Unknown Int 3" type="int">Unknown</add>
-        <add name="Unknown Float 5" type="float">Unknown</add>
-        <add name="Unknown Int 4" type="int">Unknown</add>
-        <add name="Unknown Float 6" type="float">Unknown</add>
-        <add name="Unknown Float 7" type="float">Unknown</add>
+        <add name="Unknown Int 1" type="int" />
+        <add name="Unknown Float 1" type="float" />
+        <add name="Unknown Float 2" type="float" />
+        <add name="Unknown Float 3" type="float" />
+        <add name="Unknown Int 2" type="int" />
+        <add name="Unknown Float 4" type="float" />
+        <add name="Unknown Int 3" type="int" />
+        <add name="Unknown Float 5" type="float" />
+        <add name="Unknown Int 4" type="int" />
+        <add name="Unknown Float 6" type="float" />
+        <add name="Unknown Float 7" type="float" />
     </niobject>
 
     <niobject name="NiLightIntensityController" inherit="NiFloatInterpController">
@@ -4490,8 +4490,8 @@
         Describes texture source and properties.
         <add name="Use External" type="byte" default="1">Is the texture external?</add>
         <add name="File Name" type="FilePath" cond="Use External == 1">The external texture file name.</add>
-        <add name="Unknown Link" type="Ref" template="NiObject" cond="Use External == 1" ver1="10.1.0.0">Unknown.</add>
-        <add name="Unknown Byte" type="byte" default="1" cond="Use External == 0" ver2="10.0.1.0">Unknown. Seems to be set if Pixel Data is present?</add>
+        <add name="Unknown Link" type="Ref" template="NiObject" cond="Use External == 1" ver1="10.1.0.0" />
+        <add name="Unknown Byte" type="byte" default="1" cond="Use External == 0" ver2="10.0.1.0" />
         <add name="File Name" type="FilePath" cond="Use External == 0" ver1="10.1.0.0">The original source filename of the image embedded by the referred NiPixelData object.</add>
         <add name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 0">NiPixelData or NiPersistentSrcTextureRendererData</add>
         <add name="Format Prefs" type="FormatPrefs">A set of preferences for the texture format. They are a request only and the renderer may ignore them.</add>
@@ -4507,13 +4507,13 @@
 
     <niobject name="NiSphericalCollider" inherit="NiParticleModifier" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Unknown Float 1" type="float">Unknown.</add>
-        <add name="Unknown Short 1" type="ushort">Unknown.</add>
-        <add name="Unknown Float 2" type="float">Unknown.</add>
-        <add name="Unknown Short 2" type="ushort" ver2="4.2.0.2">Unknown.</add>
-        <add name="Unknown Float 3" type="float" ver1="4.2.1.0">Unknown.</add>
-        <add name="Unknown Float 4" type="float">Unknown.</add>
-        <add name="Unknown Float 5" type="float">Unknown.</add>
+        <add name="Unknown Float 1" type="float" />
+        <add name="Unknown Short 1" type="ushort" />
+        <add name="Unknown Float 2" type="float" />
+        <add name="Unknown Short 2" type="ushort" ver2="4.2.0.2" />
+        <add name="Unknown Float 3" type="float" ver1="4.2.1.0" />
+        <add name="Unknown Float 4" type="float" />
+        <add name="Unknown Float 5" type="float" />
     </niobject>
 
     <niobject name="NiSpotLight" inherit="NiPointLight">
@@ -4567,7 +4567,7 @@
 
     <niobject name="NiTextKeyExtraData" inherit="NiExtraData">
         Extra data, used to name different animation sequences.
-        <add name="Unknown Int 1" type="uint" ver2="4.2.2.0">Unknown.  Always equals zero in all official files.</add>
+        <add name="Unknown Int 1" type="uint" ver2="4.2.2.0" default="0" />
         <add name="Num Text Keys" type="uint">The number of text keys that follow.</add>
         <add name="Text Keys" type="Key" arg="1" template="string" arr1="Num Text Keys">List of textual notes and at which time they take effect. Used for designating the start and stop of animations and the triggering of sounds.</add>
     </niobject>
@@ -4587,15 +4587,15 @@
         <add name="Plane" type="NiPlane" />
         <add name="PS2 L" type="short" default="0" ver2="10.2.0.0" />
         <add name="PS2 K" type="short" default="-75" ver2="10.2.0.0" />
-        <add name="Unknown Short" type="ushort" ver2="4.1.0.12">Unknown: 0.</add>
+        <add name="Unknown Short" type="ushort" ver2="4.1.0.12" default="0" />
     </niobject>
 
     <niobject name="NiTextureModeProperty" inherit="NiProperty" until="V10_0_1_0">
         LEGACY (pre-10.1)
         <add name="Unknown Ints" type="uint" arr1="3" ver2="2.3" />
-        <add name="Unknown Short" type="short" ver1="3.0">Unknown. Either 210 or 194.</add>
-        <add name="PS2 L" type="short" default="0" ver1="3.1" ver2="10.2.0.0">0?</add>
-        <add name="PS2 K" type="short" default="-75" ver1="3.1" ver2="10.2.0.0">-75?</add>
+        <add name="Flags" type="short" ver1="3.0">Either 210 or 194.</add>
+        <add name="PS2 L" type="short" default="0" ver1="3.1" ver2="10.2.0.0" />
+        <add name="PS2 K" type="short" default="-75" ver1="3.1" ver2="10.2.0.0" />
     </niobject>
 
     <niobject name="NiImage" inherit="NiObject" until="V10_0_1_0">
@@ -4603,16 +4603,16 @@
         <add name="Use External" type="byte">0 if the texture is internal to the NIF file.</add>
         <add name="File Name" type="FilePath" cond="Use External != 0">The filepath to the texture.</add>
         <add name="Image Data" type="Ref" template="NiRawImageData" cond="Use External == 0">Link to the internally stored image data.</add>
-        <add name="Unknown Int" type="uint" default="7">Unknown.  Often seems to be 7. Perhaps m_uiMipLevels?</add>
-        <add name="Unknown Float" type="float" ver1="3.1" default="128.5">Unknown.  Perhaps fImageScale?</add>
+        <add name="Unknown Int" type="uint" default="7" />
+        <add name="Unknown Float" type="float" ver1="3.1" default="128.5" />
     </niobject>
 
     <niobject name="NiTextureProperty" inherit="NiProperty" until="V10_0_1_0">
         LEGACY (pre-10.1)
-        <add name="Unknown Ints 1" type="uint" arr1="2" ver2="2.3">Property flags.</add>
+        <add name="Unknown Ints 1" type="uint" arr1="2" ver2="2.3" />
         <add name="Flags" type="Flags" ver1="3.0">Property flags.</add>
         <add name="Image" type="Ref" template="NiImage">Link to the texture image.</add>
-        <add name="Unknown Ints 2" type="uint" arr1="2" ver1="3.0" ver2="3.03">Unknown.  0?</add>
+        <add name="Unknown Ints 2" type="uint" arr1="2" ver1="3.0" ver2="3.03" />
     </niobject>
 
     <niobject name="NiTexturingProperty" inherit="NiProperty">
@@ -4692,12 +4692,12 @@
 
     <niobject name="NiEnvMappedTriShape" inherit="NiObjectNET" until="V10_0_1_0">
         Unknown
-        <add name="Unknown 1" type="ushort">unknown (=4 - 5)</add>
-        <add name="Unknown Matrix" type="Matrix44">unknown</add>
+        <add name="Unknown 1" type="ushort" />
+        <add name="Unknown Matrix" type="Matrix44" />
         <add name="Num Children" type="uint">The number of child objects.</add>
         <add name="Children" type="Ref" template="NiAVObject" arr1="Num Children">List of child node object indices.</add>
-        <add name="Child 2" type="Ref" template="NiObject">unknown</add>
-        <add name="Child 3" type="Ref" template="NiObject">unknown</add>
+        <add name="Child 2" type="Ref" template="NiObject" />
+        <add name="Child 3" type="Ref" template="NiObject" />
     </niobject>
 
     <niobject name="NiEnvMappedTriShapeData" inherit="NiTriShapeData" until="V10_0_1_0">
@@ -4707,31 +4707,31 @@
     <niobject name="NiBezierTriangle4" inherit="NiObject" until="V10_0_1_0">
         LEGACY (pre-10.1)
         Sub data of NiBezierMesh
-        <add name="Unknown 1" type="uint" arr1="6">unknown</add>
-        <add name="Unknown 2" type="ushort">unknown</add>
-        <add name="Matrix" type="Matrix33">unknown</add>
-        <add name="Vector 1" type="Vector3">unknown</add>
-        <add name="Vector 2" type="Vector3">unknown</add>
-        <add name="Unknown 3" type="short" arr1="4">unknown</add>
-        <add name="Unknown 4" type="byte">unknown</add>
-        <add name="Unknown 5" type="uint">unknown</add>
-        <add name="Unknown 6" type="short" arr1="24">unknown</add>
+        <add name="Unknown 1" type="uint" arr1="6" />
+        <add name="Unknown 2" type="ushort" />
+        <add name="Matrix" type="Matrix33" />
+        <add name="Vector 1" type="Vector3" />
+        <add name="Vector 2" type="Vector3" />
+        <add name="Unknown 3" type="short" arr1="4" />
+        <add name="Unknown 4" type="byte" />
+        <add name="Unknown 5" type="uint" />
+        <add name="Unknown 6" type="short" arr1="24" />
     </niobject>
 
     <niobject name="NiBezierMesh" inherit="NiAVObject" until="V10_0_1_0">
         LEGACY (pre-10.1)
         Unknown
-        <add name="Num Bezier Triangles" type="uint">references.</add>
-        <add name="Bezier Triangle" type="Ref" template="NiBezierTriangle4" arr1="Num Bezier Triangles">unknown</add>
-        <add name="Unknown 3" type="uint">Unknown.</add>
-        <add name="Count 1" type="ushort">Data count.</add>
-        <add name="Unknown 4" type="ushort">Unknown.</add>
-        <add name="Points 1" type="Vector3" arr1="Count 1">data.</add>
-        <add name="Unknown 5" type="uint">Unknown (illegal link?).</add>
-        <add name="Points 2" type="float" arr1="Count 1" arr2="2">data.</add>
-        <add name="Unknown 6" type="uint">unknown</add>
-        <add name="Count 2" type="ushort">data count 2.</add>
-        <add name="Data 2" type="ushort" arr1="Count 2" arr2="4">data count.</add>
+        <add name="Num Bezier Triangles" type="uint" />
+        <add name="Bezier Triangle" type="Ref" template="NiBezierTriangle4" arr1="Num Bezier Triangles" />
+        <add name="Unknown 3" type="uint" />
+        <add name="Count 1" type="ushort" />
+        <add name="Unknown 4" type="ushort" />
+        <add name="Points 1" type="Vector3" arr1="Count 1" />
+        <add name="Unknown 5" type="uint" />
+        <add name="Points 2" type="float" arr1="Count 1" arr2="2" />
+        <add name="Unknown 6" type="uint" />
+        <add name="Count 2" type="ushort" />
+        <add name="Data 2" type="ushort" arr1="Count 2" arr2="4" />
     </niobject>
 
     <niobject name="NiClod" inherit="NiTriBasedGeom" until="V4_0_0_2">
@@ -4763,7 +4763,7 @@
     <niobject name="NiUVController" inherit="NiTimeController" until="V20_2_0_8">
         DEPRECATED (pre-10.1), REMOVED (20.3).
         Time controller for texture coordinates.
-        <add name="Unknown Short" type="ushort">Always 0?</add>
+        <add name="Unknown Short" type="ushort" />
         <add name="Data" type="Ref" template="NiUVData">Texture coordinate controller data index.</add>
     </niobject>
 
@@ -5382,36 +5382,6 @@
         <add name="Adjoiner" type="Ptr" template="NiNode">Root of the scenegraph which is to be seen through this portal.</add>
     </niobject>
 
-    <!-- Red Ocean Custom Objects
-    <niobject name="Object" inherit="NiNode">
-        Red Ocean Object class
-        <add name="Unknown Short 1" type="short">Unknown</add>
-        <add name="Unknown Link 1" type="Ref" template="NiObject">Unknown</add>
-        <add name="Unknown Short 2" type="short">Unknown</add>
-        <add name="Unknown Short 3" type="short">Unknown</add>
-        <add name="Unknown Float 1" type="float">Unknown</add>
-    </niobject>
-    
-    <niobject name="BoundingBoxExtraData" inherit="NiExtraData">
-        Red Ocean Bounding Box
-        <add name="Flags" type="Flags">Unknown</add>
-        <add name="Center" type="Vector3">Center of box?</add>
-        <add name="Extent" type="Vector3">Extents of box?</add>
-    </niobject>
-    
-    <niobject name="Door" inherit="Object">
-        Red Ocean Object class
-        <add name="Unknown Short 1" type="short">Unknown</add>
-        <add name="Unknown Float 1" type="float">Unknowns</add>
-        <add name="Unknown Float 2" type="float">Unknowns</add>
-        <add name="Unknown Short 2" type="short">Unknown</add>
-        <add name="Unknown Int 1" type="int">Unknown</add>
-        <add name="Unknown Short 3" type="short">Unknown</add>
-        <add name="Unknown Bool 1" type="bool">Unknown</add>
-        <add name="Unknown Short 4" type="short">Unknown</add>
-        <add name="Unknown Float 3" type="float">Unknowns</add>
-    </niobject>
-    -->
     <niobject name="BSFadeNode" inherit="NiNode">
         Bethesda-specific fade node.
     </niobject>
@@ -5848,10 +5818,12 @@
         <add name="UV Offset" type="TexCoord">Offset UVs</add>
         <add name="UV Scale" type="TexCoord" default="1.0, 1.0">Offset UV Scale to repeat tiling textures</add>
         <add name="Source Texture"  type="SizedString">points to an external texture.</add>
+        <!-- TODO: Requires bitfield, read as single int -->
         <add name="Texture Clamp Mode" type="byte">How to handle texture borders.</add>
         <add name="Lighting Influence" type="byte" />
         <add name="Env Map Min LOD" type="byte" />
-        <add name="Unknown Byte" type="byte" />
+        <add name="Unused Byte" type="byte" />
+        <!-- /bitfield -->
         <add name="Falloff Start Angle" type="float" default="1.0">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
         <add name="Falloff Stop Angle" type="float" default="1.0">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
         <add name="Falloff Start Opacity" type="float">Alpha falloff multiplier at start angle</add>
@@ -5886,7 +5858,7 @@
         <add name="UV Scale" type="TexCoord" default="1.0, 1.0">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Water Shader Flags" type="SkyrimWaterShaderFlags">Defines attributes for the water shader (will use SkyrimWaterShaderFlags)</add>
         <add name="Water Direction" type="byte" default="3">A bitflag, only the first/second bit controls water flow positive or negative along UVs.</add>
-        <add name="Unknown Short 3" type="ushort">Unknown, flag?</add>  
+        <add name="Unknown Short 3" type="ushort" /> 
     </niobject>
     
     <niobject name="BSSkyShaderProperty" inherit="BSShaderProperty">
@@ -6056,9 +6028,9 @@
         Bethesda-specific object.
         <add name="Type" type="AnimNoteType">Type of this note.</add>
         <add name="Time" type="float">Location in time.</add>
-        <add name="Arm" type="uint" cond="Type == 1">Unknown.</add>
-        <add name="Gain" type="float" cond="Type == 2">Unknown.</add>
-        <add name="State" type="uint" cond="Type == 2">Unknown.</add>
+        <add name="Arm" type="uint" cond="Type == 1" />
+        <add name="Gain" type="float" cond="Type == 2" />
+        <add name="State" type="uint" cond="Type == 2" />
     </niobject>
 
     <niobject name="BSAnimNotes" inherit="NiObject">
@@ -6070,8 +6042,8 @@
     <niobject name="bhkLiquidAction" inherit="bhkSerializable">
         Bethesda-specific Havok serializable.
         <add name="User Data" type="uint" />
-        <add name="Unknown Int 2" type="int">Unknown</add>
-        <add name="Unknown Int 3" type="int">Unknown</add>
+        <add name="Unknown Int 2" type="int" />
+        <add name="Unknown Int 3" type="int" />
         <add name="Initial Stick Force" type="float" />
         <add name="Stick Strength" type="float" />
         <add name="Neighbor Distance" type="float" />
@@ -6154,7 +6126,7 @@
         <add name="Num Total Bytes Per Element" type="int" >Number of bytes per element in all channels together. Sum of num channel bytes per element over all block infos.</add>
         <add name="Block Index" type="int" >Unsure. The block in which this channel is stored? Usually there is only one block, and so this is zero.</add>
         <add name="Channel Offset" type="int" >Offset (in bytes) of this channel. Sum of all num channel bytes per element of all preceeding block infos.</add>
-        <add name="Unknown Byte 1" type="byte" default="2">Unknown, usually equal to 2.</add>
+        <add name="Unknown Byte 1" type="byte" default="2" />
     </compound>
 
     <compound name="AdditionalDataBlock">
@@ -6473,8 +6445,8 @@
 
     <compound name="ExtraMeshDataEpicMickey" versions="V20_6_5_0_DEM">
         <add name="Unknown 1" type="uint" />
-        <add name="Num Unk Floats" type="uint" />
-        <add name="Unk Floats 1" type="float" arr1="Num Unk Floats" />
+        <add name="Num Unknown Floats" type="uint" />
+        <add name="Unknown Floats 1" type="float" arr1="Num Unknown Floats" />
         <add name="Num Weights" type="uint" />
         <add name="Weights" type="WeightDataEpicMickey" arr1="Num Weights" />
         <add name="Vertex to Weight Map Size" type="uint" />
@@ -7290,9 +7262,9 @@
     <niobject name="bhkCompressedMeshShape" inherit="bhkShape">
         Compressed collision mesh.
         <add name="Target" type="Ptr" template="NiAVObject">Points to root node?</add>
-        <add name="User Data" type="uint">Unknown.</add>
+        <add name="User Data" type="uint" />
         <add name="Radius" type="float" default="0.005">A shell that is added around the shape.</add>
-        <add name="Unknown Float 1" type="float">Unknown.</add>
+        <add name="Unknown Float 1" type="float" />
         <add name="Scale" type="Vector4" default="1.0, 1.0, 1.0, 0.0">Scale</add>
         <add name="Radius Copy" type="float" default="0.005">A shell that is added around the shape.</add>
         <add name="Scale Copy" type="Vector4" default="1.0, 1.0, 1.0, 0.0">Scale</add>
@@ -7382,9 +7354,9 @@
     <niobject name="BSTreeNode" inherit="NiNode">
         Node for handling Trees, Switches branch configurations for variation?
         <add name="Num Bones 1" type="uint" />
-        <add name="Bones 1" type="Ref" arr1="Num Bones 1" template="NiNode">Unknown</add>
+        <add name="Bones 1" type="Ref" arr1="Num Bones 1" template="NiNode" />
         <add name="Num Bones 2" type="uint" />
-        <add name="Bones" type="Ref" arr1="Num Bones 2" template="NiNode">Unknown</add>
+        <add name="Bones" type="Ref" arr1="Num Bones 2" template="NiNode" />
     </niobject>
     
     

From 7631ae475d2ff5b171dab16eb0787602cf28e131 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 1 Jun 2018 22:00:34 -0400
Subject: [PATCH 25/86] Improved 3.3.0.13 and earlier support

---
 nif.xml | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/nif.xml b/nif.xml
index 425f06f..c494ea8 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2253,7 +2253,7 @@
     <niobject name="NiParticleModifier" abstract="1" inherit="NiObject" until="V10_0_1_0">
         LEGACY (pre-10.1). Abstract base class for particle system modifiers.
         <add name="Next Modifier" type="Ref" template="NiParticleModifier">Next particle modifier.</add>
-        <add name="Controller" type="Ptr" template="NiParticleSystemController" ver1="4.0.0.2">Points to the particle system controller parent.</add>
+        <add name="Controller" type="Ptr" template="NiParticleSystemController" ver1="3.3.0.13">Points to the particle system controller parent.</add>
     </niobject>
 
     <niobject name="NiPSysCollider" abstract="1" inherit="NiObject">
@@ -2607,6 +2607,8 @@
         A generic extra data object.
         <add name="Name" type="string" ver1="10.0.1.0" cond="!BSExtraData">Name of this object.</add>
         <add name="Next Extra Data" type="Ref" template="NiExtraData" ver2="4.2.2.0">Block number of the next extra data object.</add>
+        <add name="Data" type="ByteArray" ver2="3.3.0.13">The extra data was sometimes stored as binary directly on NiExtraData.</add>
+        <add name="Num Bytes" type="uint" ver1="4.0.0.0" ver2="4.2.2.0">Ignore binary data after 4.x as the child block will cover it.</add>
     </niobject>
 
     <niobject name="NiInterpolator" abstract="1" inherit="NiObject">
@@ -3021,7 +3023,7 @@
             delta = (start_time - stop_time) / sources.num_indices
         </add>
         <add name="Num Sources" type="uint" />
-        <add name="Sources" type="Ref" template="NiSourceTexture" arr1="Num Sources" ver1="4.0.0.0">The texture sources.</add>
+        <add name="Sources" type="Ref" template="NiSourceTexture" arr1="Num Sources" ver1="3.3.0.13">The texture sources.</add>
         <add name="Images" type="Ref" template="NiImage" arr1="Num Sources" ver2="3.1">The image sources</add>
     </niobject>
 
@@ -3420,7 +3422,6 @@
 
     <niobject name="NiBinaryVoxelExtraData" inherit="NiExtraData" until="V3_1">
         Voxel extra data object.
-        <add name="Unknown Int" type="uint" default="0" />
         <add name="Data" type="Ref" template="NiBinaryVoxelData" />
     </niobject>
 
@@ -3765,6 +3766,10 @@
         A NiNode used as a skeleton bone?
     </niobject>
 
+    <niobject name="NiCollisionSwitch" inherit="NiNode" until="V10_0_1_0">
+        Found in Munch's Oddysee
+    </niobject>
+
     <niobject name="AvoidNode" inherit="NiNode" versions="V4_0_0_2">
         Morrowind specific.
     </niobject>
@@ -3938,20 +3943,19 @@
         <add name="Size" type="float">Particle size</add>
         <add name="Emit Start Time" type="float">Particle emit start time</add>
         <add name="Emit Stop Time" type="float">Particle emit stop time</add>
-        <add name="Unknown Byte" type="byte" ver1="4.0.0.2" />
+        <add name="Unknown Byte" type="byte" ver1="3.3.0.13" />
         <add name="Old Emit Rate" type="uint" ver2="3.1">Particle emission rate in old files</add>
         <add name="Emit Rate" type="float" ver1="3.3.0.13">Particle emission rate (particles per second)</add>
         <add name="Lifetime" type="float">Particle lifetime</add>
         <add name="Lifetime Random" type="float">Particle lifetime random modifier</add>
-        <add name="Emit Flags" type="ushort" ver1="4.0.0.2">Bit 0: Emit Rate toggle bit (0 = auto adjust, 1 = use Emit Rate value)</add>
+        <add name="Emit Flags" type="ushort" ver1="3.3.0.13">Bit 0: Emit Rate toggle bit (0 = auto adjust, 1 = use Emit Rate value)</add>
         <add name="Start Random" type="Vector3">Particle random start translation vector</add>
         <add name="Emitter" type="Ptr" template="NiObject">This index targets the particle emitter object (TODO: find out what type of object this refers to).</add>
-        <add name="Unknown Short 2" type="ushort" ver1="4.0.0.2" />
-        <add name="Unknown Float 13" type="float" ver1="4.0.0.2" />
-        <add name="Unknown Int 1" type="uint" ver1="4.0.0.2" />
-        <add name="Unknown Int 2" type="uint" ver1="4.0.0.2" />
-        <add name="Unknown Short 3" type="ushort" ver1="4.0.0.2" />
-        <!-- <add name="Particle" type="Particle" ver2="3.1">The particle (older NIF versions only have a single particle per controller?)</add> -->
+        <add name="Unknown Short 2" type="ushort" ver1="3.3.0.13" />
+        <add name="Unknown Float 13" type="float" ver1="3.3.0.13" />
+        <add name="Unknown Int 1" type="uint" ver1="3.3.0.13" />
+        <add name="Unknown Int 2" type="uint" ver1="3.3.0.13" />
+        <add name="Unknown Short 3" type="ushort" ver1="3.3.0.13" />
         <add name="Particle Velocity" type="Vector3" ver2="3.1">Particle velocity</add>
         <add name="Particle Unknown Vector" type="Vector3" ver2="3.1" />
         <add name="Particle Lifetime" type="float" ver2="3.1">The particle's age.</add>
@@ -3960,10 +3964,10 @@
         <add name="Particle Unknown Short" type="ushort" ver2="3.1">Unknown short</add>
         <add name="Particle Vertex Id" type="ushort" ver2="3.1">Particle/vertex index matches array index</add>
 
-        <add name="Num Particles" type="ushort" ver1="4.0.0.2">Size of the following array. (Maximum number of simultaneous active particles)</add>
-        <add name="Num Valid" type="ushort" ver1="4.0.0.2">Number of valid entries in the following array. (Number of active particles at the time the system was saved)</add>
-        <add name="Particles" type="Particle" arr1="Num Particles" ver1="4.0.0.2">Individual particle modifiers?</add>
-        <add name="Unknown Link" type="Ref" template="NiObject" ver1="4.0.0.2" />
+        <add name="Num Particles" type="ushort" ver1="3.3.0.13">Size of the following array. (Maximum number of simultaneous active particles)</add>
+        <add name="Num Valid" type="ushort" ver1="3.3.0.13">Number of valid entries in the following array. (Number of active particles at the time the system was saved)</add>
+        <add name="Particles" type="Particle" arr1="Num Particles" ver1="3.3.0.13">Individual particle modifiers?</add>
+        <add name="Unknown Link" type="Ref" template="NiObject" ver1="3.3.0.13" />
         <add name="Particle Extra" type="Ref" template="NiParticleModifier">Link to some optional particle modifiers (NiGravity, NiParticleGrowFade, NiParticleBomb, ...)</add>
         <add name="Unknown Link 2" type="Ref" template="NiObject" />
         <add name="Trailer" type="byte" ver1="4.0.0.2">Trailing null byte</add>
@@ -4550,8 +4554,7 @@
     <niobject name="NiStringExtraData" inherit="NiExtraData">
         Apparently commands for an optimizer instructing it to keep things it would normally discard.
         Also refers to NiNode objects (through their name) in animation .kf files.
-        <add name="Bytes Remaining" type="uint" ver2="4.2.2.0">The number of bytes left in the record.  Equals the length of the following string + 4.</add>
-        <add name="String Data" type="string">The string.</add>
+        <add name="String Data" type="string" ver1="4.0.0.0">The string.</add>
     </niobject>
 
     <niobject name="NiStringPalette" inherit="NiObject">
@@ -4567,7 +4570,6 @@
 
     <niobject name="NiTextKeyExtraData" inherit="NiExtraData">
         Extra data, used to name different animation sequences.
-        <add name="Unknown Int 1" type="uint" ver2="4.2.2.0" default="0" />
         <add name="Num Text Keys" type="uint">The number of text keys that follow.</add>
         <add name="Text Keys" type="Key" arg="1" template="string" arr1="Num Text Keys">List of textual notes and at which time they take effect. Used for designating the start and stop of animations and the triggering of sounds.</add>
     </niobject>
@@ -4582,7 +4584,7 @@
         <add name="Texture Type" default="TEX_ENVIRONMENT_MAP" type="TextureType">The type of effect that the texture is used for.</add>
         <add name="Coordinate Generation Type" default="CG_SPHERE_MAP" type="CoordGenType">The method that will be used to generate UV coordinates for the texture effect.</add>
         <add name="Image" type="Ref" template="NiImage" ver2="3.1">Image index.</add>
-        <add name="Source Texture" type="Ref" template="NiSourceTexture" ver1="4.0.0.0">Source texture index.</add>
+        <add name="Source Texture" type="Ref" template="NiSourceTexture" ver1="3.1">Source texture index.</add>
         <add name="Enable Plane" default="0" type="byte">Determines whether a clipping plane is used.</add> <!-- Not bool as always 8-bit -->
         <add name="Plane" type="NiPlane" />
         <add name="PS2 L" type="short" default="0" ver2="10.2.0.0" />
@@ -4796,7 +4798,6 @@
         DEPRECATED (10.x), REMOVED (?)
         Not used in skinning.
         Unsure of use - perhaps for morphing animation or gravity.
-        <add name="Num Bytes" type="uint">Number of bytes in this data object.</add>
         <add name="Num Vertices" type="ushort">Number of vertices.</add>
         <add name="Weight" type="float" arr1="Num Vertices">The vertex weights.</add>
     </niobject>
@@ -5360,15 +5361,21 @@
         <add name="Rooms" type="Ptr" template="NiRoom" arr1="Num Rooms" />
     </niobject>
 
+    <niobject name="NiWall" inherit="NiNode" until="V3_3_0_13">
+        <add name="Wall Plane" type="NiPlane" />
+    </niobject>
+
     <niobject name="NiRoom" inherit="NiNode">
         NiRoom objects represent cells in a cell-portal culling system.
         <add name="Num Walls" type="int" />
-        <add name="Wall Planes" type="NiPlane" arr1="Num Walls" />
+        <add name="Walls" type="Ref" template="NiWall" arr1="Num Walls" ver2="3.3.0.13" />
+        <add name="Wall Planes" type="NiPlane" arr1="Num Walls" ver1="4.0.0.0" />
         <add name="Num In Portals" type="uint" />
         <add name="In Portals" type="Ptr" template="NiPortal" arr1="Num In Portals">The portals which see into the room.</add>
         <add name="Num Out Portals" type="uint" />
         <add name="Out Portals" type="Ptr" template="NiPortal" arr1="Num Out Portals">The portals which see out of the room.</add>
         <add name="Num Fixtures" type="uint" />
+        <!-- May actually be Ref, at least for legacy -->
         <add name="Fixtures" type="Ptr" template="NiAVObject" arr1="Num Fixtures">All geometry associated with the room.</add>
     </niobject>
 

From d6da9e6d06b880fe6c53bfda5ef0cc2db66342ef Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 1 Jun 2018 22:13:58 -0400
Subject: [PATCH 26/86] [Linting] Inherited duplicate name from 7631ae4

Hey look at that, linting helped immediately.  Too bad I forgot to lint before committing the last commit.
---
 nif.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nif.xml b/nif.xml
index c494ea8..404022d 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2607,7 +2607,7 @@
         A generic extra data object.
         <add name="Name" type="string" ver1="10.0.1.0" cond="!BSExtraData">Name of this object.</add>
         <add name="Next Extra Data" type="Ref" template="NiExtraData" ver2="4.2.2.0">Block number of the next extra data object.</add>
-        <add name="Data" type="ByteArray" ver2="3.3.0.13">The extra data was sometimes stored as binary directly on NiExtraData.</add>
+        <add name="Extra Data" type="ByteArray" ver2="3.3.0.13">The extra data was sometimes stored as binary directly on NiExtraData.</add>
         <add name="Num Bytes" type="uint" ver1="4.0.0.0" ver2="4.2.2.0">Ignore binary data after 4.x as the child block will cover it.</add>
     </niobject>
 

From 513d223ef0fe696938601705d9c5525d8b5ed793 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Mon, 4 Jun 2018 11:17:19 -0400
Subject: [PATCH 27/86] Remove ver/userver/userver2 for #76

The `ver` attribute was never actually formalized and just meant as a shorcut for using both ver1/ver2 on the same version.  `userver` was almost never used and `userver2` was becoming increasingly uncommon as most comparisons were switched to inequalities.

To make things easier, these should just be part of the expression.
---
 nif.xml | 62 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/nif.xml b/nif.xml
index 404022d..10c6cd7 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1709,8 +1709,8 @@
         <add name="Has Bone Indices" type="bool">Do we have bone indices?</add>
         <add name="Bone Indices" type="byte" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Bone Indices">Bone indices, they index into 'Bones'.</add>
 		<add name="Unknown Short" type="ushort" vercond="User Version 2 &gt; 34" />
-		<add name="Vertex Desc" type="BSVertexDesc" ver="20.2.0.7" userver2="100" />
-		<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver="20.2.0.7" userver2="100" />
+		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
+		<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
     </compound>
 
     <compound name="NiPlane">
@@ -3142,7 +3142,7 @@
         <add name="Material Extra Data" type="int" arr1="Num Materials" ver1="20.2.0.5">Extra data associated with the material. A value of -1 means the material is the default implementation.</add>
         <add name="Active Material" type="int" default="-1" ver1="20.2.0.5">The index of the currently active material.</add>
         <!-- Custom Versions -->
-        <add name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" userver="1">Cyanide extension (Blood Bowl).</add>
+        <add name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" vercond="(User Version == 1)">Cyanide extension (Blood Bowl).</add>
         <add name="WorldShift Unknown" type="int" ver1="10.3.0.1" ver2="10.4.0.1" />
         <!-- / Custom -->
         <add name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</add>
@@ -3165,8 +3165,8 @@
         <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="(User Version 2 &lt; 100)" />
         <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="(User Version 2 &gt;= 100)" cond="!NiParticleSystem" />
         <!-- Bethesda -->
-        <add name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" userver="12" />
-        <add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" userver="12" />
+        <add name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" vercond="(User Version 2 &gt; 34)" />
+        <add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" vercond="(User Version 2 &gt; 34)" />
     </niobject>
 
     <niobject name="NiTriBasedGeom" abstract="1" inherit="NiGeometry">
@@ -3227,7 +3227,7 @@
         <add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Has Vertices">The mesh vertices.</add>
         <add name="Vector Flags" type="VectorFlags" ver1="10.0.1.0" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
         <add name="BS Vector Flags" type="BSVectorFlags" vercond="((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
-        <add name="Material CRC" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" userver="12" />
+        <add name="Material CRC" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 &gt; 34" />
         <add name="Has Normals" type="bool">Do we have lighting normals? These are essential for proper lighting: if not present, the model will only be influenced by ambient light.</add>
         <add name="Normals" type="Vector3" arr1="Num Vertices" cond="Has Normals">The lighting normals.</add>
         <add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Tangent vectors.</add>
@@ -4472,11 +4472,11 @@
         Skinning data, optimized for hardware skinning. The mesh is partitioned in submeshes such that each vertex of a submesh is influenced only by a limited and fixed number of bones.
         <add name="Num Skin Partition Blocks" type="uint" />
 		<add name="Skin Partition Blocks" type="SkinPartition" arr1="Num Skin Partition Blocks" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 == 100))">Skin partition objects.</add>
-		<add name="Data Size" type="uint" ver="20.2.0.7" userver2="100" />
-		<add name="Vertex Size" type="uint" ver="20.2.0.7" userver2="100" />
-		<add name="Vertex Desc" type="BSVertexDesc" ver="20.2.0.7" userver2="100" />
-		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" arr1="Data Size / Vertex Size" cond="Data Size &gt; 0" ver="20.2.0.7" userver2="100" />
-		<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver="20.2.0.7" userver2="100" />
+		<add name="Data Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
+		<add name="Vertex Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
+		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
+		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" arr1="Data Size / Vertex Size" cond="Data Size &gt; 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
+		<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
     </niobject>
 
     <niobject name="NiTexture" abstract="1" inherit="NiObjectNET">
@@ -6107,11 +6107,11 @@
         <add name="Flags" type="byte" vercond="(User Version 2 &lt; 130)" />
         <add name="Index" type="uint" vercond="(User Version 2 &lt; 130)">Index = previous Index + previous Num Tris in Segment * 3</add>
         <add name="Num Tris in Segment" type="uint" vercond="(User Version 2 &lt; 130)">The number of triangles belonging to this segment</add>
-        <add name="Start Index" type="uint" userver2="130" />
-        <add name="Num Primitives" type="uint" userver2="130" />
-        <add name="Parent Array Index" type="uint" userver2="130" />
-        <add name="Num Sub Segments" type="uint" userver2="130" />
-        <add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" userver2="130" />
+        <add name="Start Index" type="uint" vercond="User Version 2 == 130" />
+        <add name="Num Primitives" type="uint" vercond="User Version 2 == 130" />
+        <add name="Parent Array Index" type="uint" vercond="User Version 2 == 130" />
+        <add name="Num Sub Segments" type="uint" vercond="User Version 2 == 130" />
+        <add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="User Version 2 == 130" />
     </compound>
 
     <niobject name="BSSegmentedTriShape" inherit="NiTriShape">
@@ -6463,7 +6463,7 @@
         <add name="Unknown Data" type="Vector3" arr1="Unknown Data Size" arr2="Unknown Data Width" />
         <add name="Unknown Indices" type="ushort" arr1="Unknown Data Size" />
         <add name="Num Mapped Primitives" type="ushort" vercond="(User Version &lt; 17)">When non-zero, equal to the number of primitives.</add>
-        <add name="Num Mapped Primitives" type="uint" userver="17">When non-zero, equal to the number of primitives.</add>
+        <add name="Num Mapped Primitives" type="uint" vercond="(User Version == 17)">When non-zero, equal to the number of primitives.</add>
         <add name="Mapped Primitives" type="byte" arr1="Num Mapped Primitives">Some integer associated with each primitive.</add>
         <add name="Partition Size" type="uint" />
         <add name="Partitions" type="PartitionDataEpicMickey" arr1="Partition Size" />
@@ -7376,17 +7376,17 @@
         <add name="Shader Property" type="Ref" template="BSShaderProperty" />
         <add name="Alpha Property" type="Ref" template="NiAlphaProperty" />
         <add name="Vertex Desc" type="BSVertexDesc" />
-        <add name="Num Triangles" type="uint" userver2="130" />
+        <add name="Num Triangles" type="uint" vercond="User Version 2 == 130" />
         <add name="Num Triangles" type="ushort" vercond="User Version 2 &lt; 130" />
         <add name="Num Vertices" type="ushort" />
         <add name="Data Size" type="uint" />
-        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" userver2="130" />
-        <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" userver2="100" />
+        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" vercond="User Version 2 == 130" />
+        <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" vercond="User Version 2 == 100" />
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size &gt; 0" />
-        <add name="Particle Data Size" type="uint" userver2="100" />
-        <add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" userver2="100" />
-        <add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" userver2="100" />
-        <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" userver2="100" />
+        <add name="Particle Data Size" type="uint" vercond="User Version 2 == 100" />
+        <add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" vercond="User Version 2 == 100" />
+        <add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" vercond="User Version 2 == 100" />
+        <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" vercond="User Version 2 == 100" />
     </niobject>
 
     <niobject name="BSMeshLODTriShape" inherit="BSTriShape" versions="V20_2_0_7_FO4">
@@ -7415,13 +7415,13 @@
 
     <niobject name="BSSubIndexTriShape" inherit="BSTriShape" versions="V20_2_0_7_FO4 V20_2_0_7_SSE">
         Fallout 4 Sub-Index Tri Shape
-		<add name="Num Primitives" type="uint" userver2="130" cond="Data Size &gt; 0" />
-		<add name="Num Segments" type="uint" userver2="130" cond="Data Size &gt; 0" />
-		<add name="Total Segments" type="uint" userver2="130" cond="Data Size &gt; 0" />
-		<add name="Segment" type="BSGeometrySegmentData" userver2="130" arr1="Num Segments" cond="Data Size &gt; 0" />
-		<add name="Segment Data" type="BSGeometrySegmentSharedData" userver2="130" cond="(Num Segments &lt; Total Segments) &amp;&amp; (Data Size &gt; 0)" />
-		<add name="Num Segments" type="uint" userver2="100" />
-		<add name="Segment" type="BSGeometrySegmentData" userver2="100" arr1="Num Segments" />
+		<add name="Num Primitives" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
+		<add name="Num Segments" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
+		<add name="Total Segments" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
+		<add name="Segment" type="BSGeometrySegmentData" vercond="User Version 2 == 130" arr1="Num Segments" cond="Data Size &gt; 0" />
+		<add name="Segment Data" type="BSGeometrySegmentSharedData" vercond="User Version 2 == 130" cond="(Num Segments &lt; Total Segments) &amp;&amp; (Data Size &gt; 0)" />
+		<add name="Num Segments" type="uint" vercond="User Version 2 == 100" />
+		<add name="Segment" type="BSGeometrySegmentData" vercond="User Version 2 == 100" arr1="Num Segments" />
     </niobject>
     
     <!-- Fallout 4 Physics -->

From 9c7061f804feab4624ca7795e5f16af8596a939c Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 5 Jun 2018 03:47:45 -0400
Subject: [PATCH 28/86] Initial commit for #70

Tokens are grouped by name and associated with a list of attributes.  Only listed attributes should be processed for tokens of that name.

Order of token groups matters.  Token strings can themselves include tokens, so any token group used in other tokens needs to come after.
---
 nif.xml | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/nif.xml b/nif.xml
index 10c6cd7..4b73d8b 100644
--- a/nif.xml
+++ b/nif.xml
@@ -83,6 +83,88 @@
     <version id="V30_1_0_3" num="30.1.0.3">Rocksmith, Rocksmith 2014</version>
     <version id="V30_2_0_3" num="30.2.0.3">Ghost In The Shell: First Assault, MapleStory 2</version>
 
+    <token name="verexpr" attrs="vercond">
+        Commonly used version expressions.
+        NOTE: `string` should be wrapped in parentheses for string subsitutions in larger expressions.
+        NOTE: BSVER 'Greater Than' Expressions only ever apply to BS i.e. BSVER GT 0.
+        WARNING: BSVER 'Less Than' Expressions also apply to NI i.e. BSVER EQ 0.
+        <verexpr token="#NISTREAM#" string="(#BSVER# #EQ# 0)">NiStream that are not Bethesda.</verexpr>
+        <verexpr token="#BSSTREAM#" string="(#BSVER# #GT# 0)">NiStream that are Bethesda.</verexpr>
+        <verexpr token="#NI_BS_LTE_16#" string="(#BSVER# #LTE# 16)">All NI + BS until BSVER 16.</verexpr>
+        <verexpr token="#NI_BS_LT_FO3#" string="(#BSVER# #LT# 34)">All NI + BS before Fallout 3.</verexpr>
+        <verexpr token="#NI_BS_LTE_FO3#" string="(#BSVER# #LTE# 34)">All NI + BS until Fallout 3.</verexpr>
+        <verexpr token="#NI_BS_LT_SSE#" string="(#BSVER# #LT# 100)">All NI + BS before SSE.</verexpr>
+        <verexpr token="#NI_BS_LT_FO4#" string="(#BSVER# #LT# 130)">All NI + BS before Fallout 4.</verexpr>
+        <verexpr token="#BS_GT_FO3#" string="(#BSVER# #GT# 34)">Skyrim, SSE, and Fallout 4</verexpr>
+        <verexpr token="#BS_GTE_FO3#" string="(#BSVER# #GTE# 34)">FO3 and later.</verexpr>
+        <verexpr token="#BS_GTE_SKY#" string="(#BSVER# #GTE# 83)">Skyrim and later.</verexpr>
+        <verexpr token="#BS_GTE_SSE#" string="(#BSVER# #GTE# 100)">SSE and later.</verexpr>
+        <verexpr token="#BS_SSE#" string="(#BSVER# #EQ# 100)">SSE only.</verexpr>
+        <verexpr token="#BS_FO4#" string="(#BSVER# #EQ# 130)">Fallout 4 only.</verexpr>
+        <verexpr token="#BS202#" string="((#VER# #EQ# 20.2.0.7) #AND# (#BSVER# #GT# 0))">Bethesda 20.2 only.</verexpr>
+        <verexpr token="#DIVINITY2#" string="((#USER# #EQ# 0x20000) #OR# (#USER# #EQ# 0x30000))">Divinity 2</verexpr>
+    </token>
+
+    <token name="verset" attrs="versions">
+        The set of versions that any Basic, Compound, NiObject, Enum, or Bitflags is restricted to.
+        <verset token="#BETHESDA#" string="V10_0_1_2 V10_1_0_101 V10_1_0_106 V10_2_0_0__10 V20_0_0_4__10 V20_0_0_4__11 V20_0_0_5_OBL V20_2_0_7__11_1 V20_2_0_7__11_2 V20_2_0_7__11_3 V20_2_0_7__11_4 V20_2_0_7__11_5 V20_2_0_7__11_6 V20_2_0_7__11_7 V20_2_0_7__11_8 V20_2_0_7_FO3 V20_2_0_7_SKY V20_2_0_7_SSE V20_2_0_7_FO4" />
+        <verset token="#FO3#" string="V20_0_0_4__11 V20_2_0_7__11_1 V20_2_0_7__11_2 V20_2_0_7__11_3 V20_2_0_7__11_4 V20_2_0_7__11_5 V20_2_0_7__11_6 V20_2_0_7__11_7 V20_2_0_7__11_8 V20_2_0_7_FO3" />
+        <verset token="#SKY#" string="V20_2_0_7_SKY" />
+        <verset token="#SSE#" string="V20_2_0_7_SSE" />
+        <verset token="#FO4#" string="V20_2_0_7_FO4" />
+        <verset token="#FO3_AND_LATER#" string="V20_0_0_4__11 V20_2_0_7__11_1 V20_2_0_7__11_2 V20_2_0_7__11_3 V20_2_0_7__11_4 V20_2_0_7__11_5 V20_2_0_7__11_6 V20_2_0_7__11_7 V20_2_0_7__11_8 V20_2_0_7_FO3 V20_2_0_7_SKY V20_2_0_7_SSE V20_2_0_7_FO4" />
+        <verset token="#SKY_AND_LATER#" string="V20_2_0_7_SKY V20_2_0_7_SSE V20_2_0_7_FO4" />
+    </token>
+
+    <token name="default" attrs="default">
+        Commonly used default values.
+        <default token="#UINT_MAX#" string="0xFFFFFFFF" />
+        <default token="#USHRT_MAX#" string="0xFFFF" />
+        <default token="#VEC2_ONE#" string="1.0, 1.0" />
+        <default token="#VEC3_ONE#" string="1.0, 1.0, 1.0" />
+        <default token="#VEC3_ZERO#" string="0.0, 0.0, 0.0" />
+        <default token="#VEC4_1110#" string="1.0, 1.0, 1.0, 0.0" />
+        <default token="#X_AXIS#" string="1.0, 0.0, 0.0" />
+        <default token="#Y_AXIS#" string="0.0, 1.0, 0.0" />
+        <default token="#Z_AXIS#" string="0.0, 0.0, 1.0" />
+        <default token="#NEG_X_AXIS#" string="-1.0, 0.0, 0.0" />
+        <default token="#NEG_Y_AXIS#" string="0.0, -1.0, 0.0" />
+        <default token="#NEG_Z_AXIS#" string="0.0, 0.0, -1.0" />
+        <default token="#FLT_MAX#" string="3.402823466e+38" />
+        <default token="#FLT_MIN#" string="-3.402823466e+38" />
+        <default token="#INV_FLT#" string="-3.402823466e+38" />
+        <default token="#INV_VEC3#" string="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
+        <default token="#INV_VEC4#" string="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
+    </token>
+    
+    <token name="global" attrs="vercond">
+        Global Tokens.
+        NOTE: These must be listed after the above tokens so that they replace last. For example, `verexpr` uses these tokens.
+        <global token="#VER#" string="Version" />
+        <global token="#USER#" string="User Version" />
+        <global token="#BSVER#" string="User Version 2" />
+    </token>
+
+    <token name="operator" attrs="cond vercond arr1 arr2 arg">
+        All Operators except for unary not (!), parentheses, and member of (\)
+        NOTE: These can be ignored entirely by string substitution and dealt with directly.
+        NOTE: These must be listed after the above tokens so that they replace last. For example, `verexpr` uses these tokens.
+        <operator token="#ADD#" string="+" />
+        <operator token="#SUB#" string="-" />
+        <operator token="#MUL#" string="*" />
+        <operator token="#DIV#" string="/" />
+        <operator token="#AND#" string="&amp;&amp;" />
+        <operator token="#OR#" string="||" />
+        <operator token="#LT#" string="&lt;" />
+        <operator token="#GT#" string="&gt;" />
+        <operator token="#LTE#" string="&lt;=" />
+        <operator token="#GTE#" string="&gt;=" />
+        <operator token="#EQ#" string="==" />
+        <operator token="#NEQ#" string="!=" />
+        <operator token="#BITAND#" string="&amp;" />
+        <operator token="#BITOR#" string="|" />
+    </token>
+
     <!--Basic Types-->
 
     <basic name="bool" count="1">

From fd66c97557d115c833503136eb403d0e111697c2 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 5 Jun 2018 04:11:30 -0400
Subject: [PATCH 29/86] Bethesda block versioning

Using tokens from #70 it is now feasible to version the Bethesda blocks.
---
 nif.xml | 448 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 224 insertions(+), 224 deletions(-)

diff --git a/nif.xml b/nif.xml
index 4b73d8b..508e836 100644
--- a/nif.xml
+++ b/nif.xml
@@ -311,7 +311,7 @@
         <option value="5" name="CONST_KEY">Step function. Used for visibility keys in NiBoolData.</option>
     </enum>
 
-    <enum name="OblivionHavokMaterial" storage="uint">
+    <enum name="OblivionHavokMaterial" storage="uint" versions="#BETHESDA#">
         Bethesda Havok. Material descriptor for a Havok shape in Oblivion.
         <option value="0" name="OB_HAV_MAT_STONE">Stone</option>
         <option value="1" name="OB_HAV_MAT_CLOTH">Cloth</option>
@@ -347,7 +347,7 @@
         <option value="31" name="OB_HAV_MAT_RUBBER">Rubber</option>
     </enum>
 
-    <enum name="Fallout3HavokMaterial" storage="uint">
+    <enum name="Fallout3HavokMaterial" storage="uint" versions="#BETHESDA#">
         Bethesda Havok. Material descriptor for a Havok shape in Fallout 3 and Fallout NV.
         <option value="0" name="FO_HAV_MAT_STONE">Stone</option>
         <option value="1" name="FO_HAV_MAT_CLOTH">Cloth</option>
@@ -479,7 +479,7 @@
         <option value="127" name="FO_HAV_MAT_RUBBER_BALL_STAIRS_PLATFORM">Rubber Ball</option>
     </enum>
 
-    <enum name="SkyrimHavokMaterial" storage="uint">
+    <enum name="SkyrimHavokMaterial" storage="uint" versions="#SKY_AND_LATER#">
         Bethesda Havok. Material descriptor for a Havok shape in Skyrim.
         <option value="131151687" name="SKY_HAV_MAT_BROKEN_STONE">Broken Stone</option>
         <option value="365420259" name="SKY_HAV_MAT_LIGHT_WOOD">Light Wood</option>
@@ -544,7 +544,7 @@
         <option value="4283869410" name="SKY_HAV_MAT_MATERIAL_BOULDER_MEDIUM">Material Boulder Medium</option>
     </enum>
 
-    <enum name="OblivionLayer" storage="byte">
+    <enum name="OblivionLayer" storage="byte" versions="#BETHESDA#">
         Bethesda Havok. Describes the collision layer a body belongs to in Oblivion.
         <option value="0" name="OL_UNIDENTIFIED">Unidentified (white)</option>
         <option value="1" name="OL_STATIC">Static (red)</option>
@@ -606,7 +606,7 @@
         <option value="57" name="OL_NULL">Null</option>
     </enum>
 
-    <enum name="Fallout3Layer" storage="byte">
+    <enum name="Fallout3Layer" storage="byte" versions="#BETHESDA#">
         Bethesda Havok. Describes the collision layer a body belongs to in Fallout 3 and Fallout NV.
         <option value="0" name="FOL_UNIDENTIFIED">Unidentified (white)</option>
         <option value="1" name="FOL_STATIC">Static (red)</option>
@@ -654,7 +654,7 @@
         <option value="43" name="FOL_NULL">Null (white)</option>
     </enum>
 
-    <enum name="SkyrimLayer" storage="byte">
+    <enum name="SkyrimLayer" storage="byte" versions="#SKY_AND_LATER#">
         Bethesda Havok. Describes the collision layer a body belongs to in Skyrim.
         <option value="0" name="SKYL_UNIDENTIFIED">Unidentified</option>
         <option value="1" name="SKYL_STATIC">Static</option>
@@ -706,7 +706,7 @@
         <option value="47" name="SKYL_NULL">Null</option>
     </enum>
 
-    <enum name="MoppDataBuildType" storage="byte">
+    <enum name="MoppDataBuildType" storage="byte" versions="#SKY_AND_LATER#">
         Bethesda Havok.
         A byte describing if MOPP Data is organized into chunks (PS3) or not (PC)
         <option value="0" name="BUILT_WITH_CHUNK_SUBDIVISION">Organized in chunks for PS3.</option>
@@ -936,7 +936,7 @@
         <option value="7" name="ZCOMP_NEVER">Always false. Ref value is ignored.</option>
     </enum>
 
-    <enum name="hkMotionType" storage="byte">
+    <enum name="hkMotionType" storage="byte" versions="#BETHESDA#">
         Bethesda Havok, based on hkpMotion::MotionType. Motion type of a rigid body determines what happens when it is simulated.
         <option value="0" name="MO_SYS_INVALID">Invalid</option>
         <option value="1" name="MO_SYS_DYNAMIC">A fully-simulated, movable rigid body. At construction time the engine checks the input inertia and selects MO_SYS_SPHERE_INERTIA or MO_SYS_BOX_INERTIA as appropriate.</option>
@@ -950,7 +950,7 @@
         <option value="9" name="MO_SYS_CHARACTER">A specialized motion used for character controllers</option>
     </enum>
 
-    <enum name="hkDeactivatorType" storage="byte">
+    <enum name="hkDeactivatorType" storage="byte" versions="#BETHESDA#">
         Bethesda Havok, based on hkpRigidBodyDeactivator::DeactivatorType.
         Deactivator Type determines which mechanism Havok will use to classify the body as deactivated.
         <option value="0" name="DEACTIVATOR_INVALID">Invalid</option>
@@ -958,7 +958,7 @@
         <option value="2" name="DEACTIVATOR_SPATIAL">Tells Havok to use a spatial deactivation scheme. This makes use of high and low frequencies of positional motion to determine when deactivation should occur.</option>
     </enum>
 
-    <enum name="hkSolverDeactivation" storage="byte">
+    <enum name="hkSolverDeactivation" storage="byte" versions="#BETHESDA#">
         Bethesda Havok, based on hkpRigidBodyCinfo::SolverDeactivation.
         A list of possible solver deactivation settings. This value defines how aggressively the solver deactivates objects.
         Note: Solver deactivation does not save CPU, but reduces creeping of movable objects in a pile quite dramatically.
@@ -970,7 +970,7 @@
         <option value="5" name="SOLVER_DEACTIVATION_MAX">Very fast deactivation, visible artifacts.</option>
     </enum>
 
-    <enum name="hkQualityType" storage="byte">
+    <enum name="hkQualityType" storage="byte" versions="#BETHESDA#">
         Bethesda Havok, based on hkpCollidableQualityType. Describes the priority and quality of collisions for a body,
             e.g. you may expect critical game play objects to have solid high-priority collisions so that they never sink into ground,
             or may allow penetrations for visual debris objects.
@@ -1115,7 +1115,7 @@
         <option value="5" name="HALFSPACE_BV">Half Space</option>
     </enum>
 
-    <enum name="hkResponseType" storage="byte">
+    <enum name="hkResponseType" storage="byte" versions="#BETHESDA#">
         Bethesda Havok.
         <option value="0" name="RESPONSE_INVALID">Invalid Response</option>
         <option value="1" name="RESPONSE_SIMPLE_CONTACT">Do normal collision resolution</option>
@@ -1123,7 +1123,7 @@
         <option value="3" name="RESPONSE_NONE">Do nothing, ignore all the results.</option>
     </enum>
     
-    <enum name="BSDismemberBodyPartType" storage="ushort">
+    <enum name="BSDismemberBodyPartType" storage="ushort" versions="#BETHESDA#">
         Biped bodypart data used for visibility control of triangles.  Options are Fallout 3, except where marked for Skyrim (uses SBP prefix)
         Skyrim BP names are listed only for vanilla names, different creatures have different defnitions for naming.
         <option value="0" name="BP_TORSO">Torso</option>
@@ -1226,7 +1226,7 @@
         <option value="13000" name="BP_TORSOSECTION_BRAIN">Torso Section | Brain</option>       
     </enum>
 	
-    <enum name="BSLightingShaderPropertyShaderType" storage="uint" prefix="ST">
+    <enum name="BSLightingShaderPropertyShaderType" storage="uint" prefix="ST" versions="#SKY_AND_LATER#">
         Values for configuring the shader type in a BSLightingShaderProperty
         <option value="0" name="Default" />
         <option value="1" name="Environment Map">Enables EnvMap Mask(TS6), EnvMap Scale</option>
@@ -1251,7 +1251,7 @@
         <option value="20" name="FO4 Dismemberment" />
     </enum>
 
-    <enum name="EffectShaderControlledVariable" storage="uint" prefix="ESCV">
+    <enum name="EffectShaderControlledVariable" storage="uint" prefix="ESCV" versions="#SKY_AND_LATER#">
         An unsigned 32-bit integer, describing which float variable in BSEffectShaderProperty to animate.
         <option value="0" name="EmissiveMultiple">EmissiveMultiple.</option>
         <option value="1" name="Falloff Start Angle">Falloff Start Angle (degrees).</option>
@@ -1265,12 +1265,12 @@
         <option value="9" name="V Scale">V Scale.</option>
     </enum>
 
-    <enum name="EffectShaderControlledColor" storage="uint" prefix="ECSC">
+    <enum name="EffectShaderControlledColor" storage="uint" prefix="ECSC" versions="#SKY_AND_LATER#">
         An unsigned 32-bit integer, describing which color in BSEffectShaderProperty to animate.
         <option value="0" name="Emissive Color">Emissive Color.</option>
     </enum>
 
-    <enum name="LightingShaderControlledVariable" storage="uint" prefix="LSCV">
+    <enum name="LightingShaderControlledVariable" storage="uint" prefix="LSCV" versions="#SKY_AND_LATER#">
         An unsigned 32-bit integer, describing which float variable in BSLightingShaderProperty to animate.
         <option value="0" name="Refraction Strength">The amount of distortion.</option>
         <option value="8" name="Environment Map Scale">Environment Map Scale.</option>
@@ -1284,13 +1284,13 @@
         <option value="23" name="V Scale">V Scale.</option>
     </enum>
 
-    <enum name="LightingShaderControlledColor" storage="uint" prefix="LSCC">
+    <enum name="LightingShaderControlledColor" storage="uint" prefix="LSCC" versions="#SKY_AND_LATER#">
         An unsigned 32-bit integer, describing which color in BSLightingShaderProperty to animate.
         <option value="0" name="Specular Color">Specular Color.</option>
         <option value="1" name="Emissive Color">Emissive Color.</option>
     </enum>
 
-    <enum name="hkConstraintType" storage="uint">
+    <enum name="hkConstraintType" storage="uint" versions="#BETHESDA#">
         Bethesda Havok. Describes the type of bhkConstraint.
         <option value="0" name="BallAndSocket">A ball and socket constraint.</option>
         <option value="1" name="Hinge">A hinge constraint.</option>
@@ -1423,7 +1423,7 @@
         <add name="z" type="float" default="0.0">The z-coordinate.</add>
     </compound>
 
-    <compound name="hkQuaternion">
+    <compound name="hkQuaternion" versions="#BETHESDA#">
         A quaternion as it appears in the havok objects.
         <add name="x" type="float" default="0.0">The x-coordinate.</add>
         <add name="y" type="float" default="0.0">The y-coordinate.</add>
@@ -1488,7 +1488,7 @@
         <add name="m44" type="float" default="1.0">The (4,4) element.</add>
     </compound>
 
-    <compound name="hkMatrix3">
+    <compound name="hkMatrix3" versions="#BETHESDA#">
         A 3x3 Havok matrix stored in 4x3 due to memory alignment.
         <add name="m11" type="float" default="1.0" />
         <add name="m12" type="float" />
@@ -1582,7 +1582,7 @@
         <add name="Interpolator ID" type="string" ver1="20.1.0.1">An ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</add>
     </compound>
 
-    <compound name="ExportInfo">
+    <compound name="ExportInfo" versions="#BETHESDA#">
     	Information about how the file was exported
         <add name="Author" type="ShortString" />
         <add name="Process Script" type="ShortString" />
@@ -1707,7 +1707,7 @@
         <add name="v3" type="ushort">Third vertex index.</add>
     </compound>
 	
-	<bitflags name="VertexFlags" storage="ushort" prefix="VF">
+	<bitflags name="VertexFlags" storage="ushort" prefix="VF" versions="#SSE# #FO4#">
 		<!-- First 4 bits are unused -->
 		<option value="4" name="Vertex" />          <!-- & 16 -->
 		<option value="5" name="UVs" />             <!-- & 32 -->
@@ -1723,7 +1723,7 @@
 		<!-- Last bit unused -->
 	</bitflags>
     
-	<compound name="BSVertexData">
+	<compound name="BSVertexData" versions="#SSE# #FO4#">
 		<add name="Vertex" type="Vector3" cond="(ARG &amp; 0x4010) == 0x4010" />
 		<add name="Bitangent X" type="float" cond="(ARG &amp; 0x4110) == 0x4110" />
 		<add name="Unknown Int" type="uint" cond="(ARG &amp; 0x4110) == 0x4010" />
@@ -1743,7 +1743,7 @@
 		<add name="Eye Data" type="float" cond="ARG &amp; 0x1000" />
 	</compound>
 
-	<compound name="BSVertexDataSSE">
+	<compound name="BSVertexDataSSE" versions="#SSE# #FO4#">
 		<add name="Vertex" type="Vector3" cond="ARG &amp; 0x10" />
 		<add name="Bitangent X" type="float" cond="(ARG &amp; 0x110) == 0x110" />
 		<add name="Unknown Int" type="int" cond="(ARG &amp; 0x110) == 0x10" />
@@ -1758,7 +1758,7 @@
 		<add name="Eye Data" type="float" cond="ARG &amp; 0x1000" />
 	</compound>
 
-    <compound name="BSVertexDesc">
+    <compound name="BSVertexDesc" versions="#SSE# #FO4#">
         <add name="VF1" type="byte" />
         <add name="VF2" type="byte" />
         <add name="VF3" type="byte" />
@@ -1830,7 +1830,7 @@
         <add name="Scale" type="float" default="1.0">Scaling part (only uniform scaling is supported).</add>
     </compound>
 
-	<bitflags name="FurnitureEntryPoints" storage="ushort">
+	<bitflags name="FurnitureEntryPoints" storage="ushort" versions="#BETHESDA#">
 		Bethesda Animation. Furniture entry points. It specifies the direction(s) from where the actor is able to enter (and leave) the position.
 		<option value="0" name="Front">front entry point</option>
 		<option value="1" name="Behind">behind entry point</option>
@@ -1839,14 +1839,14 @@
 		<option value="4" name="Up">up entry point - unknown function. Used on some beds in Skyrim, probably for blocking of sleeping position.</option>
 	</bitflags>
 
-	<enum name="AnimationType" storage="ushort">
+	<enum name="AnimationType" storage="ushort" versions="#BETHESDA#">
 		Bethesda Animation. Animation type used on this position. This specifies the function of this position.
 		<option value="1" name="Sit">Actor use sit animation.</option>
 		<option value="2" name="Sleep">Actor use sleep animation.</option>
 		<option value="4" name="Lean">Used for lean animations?</option>
 	</enum>
 
-    <compound name="FurniturePosition">
+    <compound name="FurniturePosition" versions="#BETHESDA#">
         Bethesda Animation. Describes a furniture position?
         <add name="Offset" type="Vector3">Offset of furniture marker.</add>
         <add name="Orientation" type="ushort" vercond="User Version 2 &lt;= 34">Furniture marker orientation.</add>
@@ -1857,7 +1857,7 @@
         <add name="Entry Properties" type="FurnitureEntryPoints" vercond="User Version 2 &gt; 34" />
     </compound>
 
-    <compound name="TriangleData">
+    <compound name="TriangleData" versions="#BETHESDA#">
         Bethesda Havok. A triangle with extra data used for physics.
         <add name="Triangle" type="Triangle">The triangle.</add>
         <add name="Welding Info" type="ushort">Additional havok information on how triangles are welded.</add>
@@ -1894,7 +1894,7 @@
         <add name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver1="4.2.2.0" cond="ARG != 0">The vertex weights.</add>
     </compound>
 
-    <compound name="HavokFilter">
+    <compound name="HavokFilter" versions="#BETHESDA#">
         Bethesda Havok. Collision filter info representing Layer, Flags, Part Number, and Group all combined into one uint.
         <add name="Layer" suffix="OB" type="OblivionLayer" default="OL_STATIC" ver2="20.0.0.5" vercond="(User Version 2 &lt; 16)">The layer the collision belongs to.</add>
         <add name="Layer" suffix="FO" type="Fallout3Layer" default="FOL_STATIC" vercond="(Version == 20.2.0.7) &amp;&amp; (User Version 2 &lt;= 34)">The layer the collision belongs to.</add>
@@ -1942,7 +1942,7 @@
         <add name="Group" type="ushort" />
     </compound>
 
-    <compound name="HavokMaterial">
+    <compound name="HavokMaterial" versions="#BETHESDA#">
         Bethesda Havok. Material wrapper for varying material enums by game.
         <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
         <add name="Material" suffix="OB" type="OblivionHavokMaterial" ver2="20.0.0.5" vercond="(User Version 2 &lt; 16)">The material of the shape.</add>
@@ -1950,14 +1950,14 @@
         <add name="Material" suffix="SK" type="SkyrimHavokMaterial" vercond="(Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 34)">The material of the shape.</add>
     </compound>
 
-    <compound name="OblivionSubShape">
+    <compound name="OblivionSubShape" versions="#BETHESDA#">
         Bethesda Havok. Havok Information for packed TriStrip shapes.
         <add name="Havok Filter" type="HavokFilter" />
         <add name="Num Vertices" type="uint">The number of vertices that form this sub shape.</add>
         <add name="Material" type="HavokMaterial">The material of the subshape.</add>
     </compound>
 
-    <compound name="bhkPositionConstraintMotor">
+    <compound name="bhkPositionConstraintMotor" versions="#BETHESDA#">
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
         <add name="Tau" type="float" default="0.8">Relative stiffness</add>
@@ -1967,7 +1967,7 @@
         <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
     </compound>
 
-    <compound name="bhkVelocityConstraintMotor">
+    <compound name="bhkVelocityConstraintMotor" versions="#BETHESDA#">
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
         <add name="Tau" type="float" default="0">Relative stiffness</add>
@@ -1976,7 +1976,7 @@
         <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
     </compound>
 
-    <compound name="bhkSpringDamperConstraintMotor">
+    <compound name="bhkSpringDamperConstraintMotor" versions="#BETHESDA#">
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
         <add name="Spring Constant" type="float" default="0">The spring constant in N/m</add>
@@ -1984,21 +1984,21 @@
         <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
     </compound>
     
-    <enum name="MotorType" storage="byte">
+    <enum name="MotorType" storage="byte" versions="#BETHESDA#">
         <option value="0" name="MOTOR_NONE" />
         <option value="1" name="MOTOR_POSITION" />
         <option value="2" name="MOTOR_VELOCITY" />
         <option value="3" name="MOTOR_SPRING" />
     </enum>
 
-    <compound name="MotorDescriptor">
+    <compound name="MotorDescriptor" versions="#BETHESDA#">
         <add name="Type" type="MotorType" default="MOTOR_NONE" />
         <add name="Position Motor" type="bhkPositionConstraintMotor" cond="Type == 1" />
         <add name="Velocity Motor" type="bhkVelocityConstraintMotor" cond="Type == 2" />
         <add name="Spring Damper Motor" type="bhkSpringDamperConstraintMotor" cond="Type == 3" />
     </compound>
 
-    <compound name="RagdollDescriptor">
+    <compound name="RagdollDescriptor" versions="#BETHESDA#">
         This constraint defines a cone in which an object can rotate. The shape of the cone can be controlled in two (orthogonal) directions.
         <!-- Oblivion and Fallout 3, Havok 550 -->
         <add name="Pivot A" type="Vector4" vercond="User Version 2 &lt;= 16">The point where the constraint is attached to its parent rigidbody.</add>
@@ -2028,7 +2028,7 @@
         <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="User Version 2 &gt; 16" />
     </compound>
 
-    <compound name="LimitedHingeDescriptor">
+    <compound name="LimitedHingeDescriptor" versions="#BETHESDA#">
         This constraint allows rotation about a specified axis, limited by specified boundaries.
     
         <!-- Oblivion and Fallout 3, Havok 550 -->
@@ -2058,7 +2058,7 @@
         <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="User Version 2 &gt; 16" />
     </compound>
 
-    <compound name="HingeDescriptor">
+    <compound name="HingeDescriptor" versions="#BETHESDA#">
     	This constraint allows rotation about a specified axis. 
         <!-- Oblivion -->
         <add name="Pivot A" type="Vector4" ver2="20.0.0.5">Pivot point around which the object will rotate.</add>
@@ -2080,12 +2080,12 @@
         <!-- no friction -->
     </compound>
 
-    <compound name="BallAndSocketDescriptor">
+    <compound name="BallAndSocketDescriptor" versions="#BETHESDA#">
         <add name="Pivot A" type="Vector4">Pivot point in the local space of entity A.</add>
         <add name="Pivot B" type="Vector4">Pivot point in the local space of entity B.</add>
     </compound>
 
-    <compound name="PrismaticDescriptor">
+    <compound name="PrismaticDescriptor" versions="#BETHESDA#">
         <!-- Oblivion -->
         <add name="Pivot A" type="Vector4" ver2="20.0.0.5">Pivot.</add>
         <add name="Rotation A" type="Vector4" ver2="20.0.0.5">Rotation axis.</add>
@@ -2114,7 +2114,7 @@
         <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="User Version 2 &gt; 16" />
     </compound>
 
-    <compound name="StiffSpringDescriptor">
+    <compound name="StiffSpringDescriptor" versions="#BETHESDA#">
         <add name="Pivot A" type="Vector4" />
         <add name="Pivot B" type="Vector4" />
         <add name="Length" type="float" />
@@ -2192,13 +2192,13 @@
         <add name="Normals" type="Vector3" arr1="Num Vectors">Vector Normals</add>
     </compound>
 
-    <bitflags name="BSPartFlag" storage="ushort">
+    <bitflags name="BSPartFlag" storage="ushort" versions="#BETHESDA#">
         Editor flags for the Body Partitions. 
         <option value="0" name="PF_EDITOR_VISIBLE">Visible in Editor</option>
         <option value="8" name="PF_START_NET_BONESET">Start a new shared boneset.  It is expected this BoneSet and the following sets in the Skin Partition will have the same bones.</option>
     </bitflags>
 
-    <compound name="BodyPartList">
+    <compound name="BodyPartList" versions="#BETHESDA#">
         Body part list for DismemberSkinInstance
         <add name="Part Flag" type="BSPartFlag" default="257">Flags related to the Body Partition</add>
         <add name="Body Part" type="BSDismemberBodyPartType">Body Part Index</add>
@@ -2210,13 +2210,13 @@
         <add name="Bone Name" type="string" />
     </compound>
 
-    <compound name="bhkCMSDMaterial">
+    <compound name="bhkCMSDMaterial" versions="#SKY_AND_LATER#">
         Per-chunk material, used in bhkCompressedMeshShapeData
         <add name="Material" type="SkyrimHavokMaterial" />
         <add name="Filter" type="HavokFilter" />
     </compound>
 
-    <compound name="bhkCMSDBigTris">
+    <compound name="bhkCMSDBigTris" versions="#SKY_AND_LATER#">
         Triangle indices used in pair with "Big Verts" in a bhkCompressedMeshShapeData.
         <add name="Triangle 1" type="ushort" />
         <add name="Triangle 2" type="ushort" />
@@ -2225,13 +2225,13 @@
         <add name="Welding Info" type="ushort" />
     </compound>
     
-    <compound name="bhkCMSDTransform">
+    <compound name="bhkCMSDTransform" versions="#SKY_AND_LATER#">
         A set of transformation data: translation and rotation
         <add name="Translation" type="Vector4">A vector that moves the chunk by the specified amount. W is not used.</add>
         <add name="Rotation" type="hkQuaternion">Rotation. Reference point for rotation is bhkRigidBody translation.</add>
     </compound>
     
-    <compound name="bhkCMSDChunk">
+    <compound name="bhkCMSDChunk" versions="#SKY_AND_LATER#">
         Defines subshape chunks in bhkCompressedMeshShapeData
         <add name="Translation" type="Vector4" />
         <add name="Material Index" type="uint">Index of material in bhkCompressedMeshShapeData::Chunk Materials</add>
@@ -2247,7 +2247,7 @@
         <add name="Welding Info" type="ushort" arr1="Num Welding Info" />
     </compound>
 
-    <compound name="MalleableDescriptor">
+    <compound name="MalleableDescriptor" versions="#BETHESDA#">
         <add name="Type" type="hkConstraintType">Type of constraint.</add>
         <add name="Num Entities" type="uint" default="2">Always 2 (Hardcoded). Number of bodies affected by this constraint.</add>
         <add name="Entity A" type="Ptr" template="bhkEntity">Usually NONE. The entity affected by this constraint.</add>
@@ -2264,7 +2264,7 @@
         <add name="Strength" type="float" ver1="20.2.0.7" /><!-- In GECK and Creation Kit described as Strength -->
     </compound>
 
-    <compound name="ConstraintData">
+    <compound name="ConstraintData" versions="#BETHESDA#">
         <add name="Type" type="hkConstraintType">Type of constraint.</add>
         <add name="Num Entities 2" type="uint" default="2">Always 2 (Hardcoded). Number of bodies affected by this constraint.</add>
         <add name="Entity A" type="Ptr" template="bhkEntity">Usually NONE. The entity affected by this constraint.</add>
@@ -2349,28 +2349,28 @@
         <add name="Collider Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the collider.</add>
     </niobject>
 
-    <enum name="BroadPhaseType" storage="byte">
+    <enum name="BroadPhaseType" storage="byte" versions="#BETHESDA#">
         <option value="0" name="BROAD_PHASE_INVALID" />
         <option value="1" name="BROAD_PHASE_ENTITY" />
         <option value="2" name="BROAD_PHASE_PHANTOM" />
         <option value="3" name="BROAD_PHASE_BORDER" />
     </enum>
 
-    <compound name="hkWorldObjCinfoProperty">
+    <compound name="hkWorldObjCinfoProperty" versions="#BETHESDA#">
         <add name="Data" type="uint" default="0" />
         <add name="Size" type="uint" default="0" />
         <add name="Capacity and Flags" type="uint" default="0x80000000" />
     </compound>
 
-    <niobject name="bhkRefObject" abstract="1" inherit="NiObject">
+    <niobject name="bhkRefObject" abstract="1" inherit="NiObject" versions="#BETHESDA#">
         The base type of most Bethesda-specific Havok-related NIF objects.
     </niobject>
 
-    <niobject name="bhkSerializable" abstract="1" inherit="bhkRefObject">
+    <niobject name="bhkSerializable" abstract="1" inherit="bhkRefObject" versions="#BETHESDA#">
         Havok objects that can be saved and loaded from disk?
     </niobject>
 
-    <niobject name="bhkWorldObject" abstract="1" inherit="bhkSerializable">
+    <niobject name="bhkWorldObject" abstract="1" inherit="bhkSerializable" versions="#BETHESDA#">
         Havok objects that have a position in the world?
         <add name="Shape" type="Ref" template="bhkShape"> Link to the body for this collision object.</add>
         <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
@@ -2381,25 +2381,25 @@
         <add name="Cinfo Property" type="hkWorldObjCinfoProperty" />
     </niobject>
 
-    <niobject name="bhkPhantom" abstract="1" inherit="bhkWorldObject">
+    <niobject name="bhkPhantom" abstract="1" inherit="bhkWorldObject" versions="#BETHESDA#">
         Havok object that do not react with other objects when they collide (causing deflection, etc.) but still trigger collision notifications to the game.  Possible uses are traps, portals, AI fields, etc.
     </niobject>
 
-    <niobject name="bhkShapePhantom" abstract="1" inherit="bhkPhantom">
+    <niobject name="bhkShapePhantom" abstract="1" inherit="bhkPhantom" versions="#BETHESDA#">
         A Havok phantom that uses a Havok shape object for its collision volume instead of just a bounding box.
     </niobject>
 
-    <niobject name="bhkSimpleShapePhantom" inherit="bhkShapePhantom">
+    <niobject name="bhkSimpleShapePhantom" inherit="bhkShapePhantom" versions="#BETHESDA#">
         Unknown shape.
         <add name="Unused 2" type="byte" arr1="8">Garbage data from memory.</add>
         <add name="Transform" type="Matrix44" />
     </niobject>
 
-    <niobject name="bhkEntity" abstract="1" inherit="bhkWorldObject">
+    <niobject name="bhkEntity" abstract="1" inherit="bhkWorldObject" versions="#BETHESDA#">
         A havok node, describes physical properties.
     </niobject>
 
-    <niobject name="bhkRigidBody" inherit="bhkEntity">
+    <niobject name="bhkRigidBody" inherit="bhkEntity" versions="#BETHESDA#">
         This is the default body type for all "normal" usable and static world objects. The "T" suffix
         marks this body as active for translation and rotation, a normal bhkRigidBody ignores those
         properties. Because the properties are equal, a bhkRigidBody may be renamed into a bhkRigidBodyT and vice-versa.
@@ -2457,59 +2457,59 @@
         <add name="Body Flags" type="ushort" vercond="(User Version 2 &gt;= 76)">1 = respond to wind</add>
     </niobject>
 
-    <niobject name="bhkRigidBodyT" inherit="bhkRigidBody">
+    <niobject name="bhkRigidBodyT" inherit="bhkRigidBody" versions="#BETHESDA#">
         The "T" suffix marks this body as active for translation and rotation.
     </niobject>
 
-    <niobject name="bhkConstraint" abstract="1" inherit="bhkSerializable">
+    <niobject name="bhkConstraint" abstract="1" inherit="bhkSerializable" versions="#BETHESDA#">
         Describes a physical constraint.
         <add name="Num Entities" type="uint">Number of bodies affected by this constraint.</add>
         <add name="Entities" type="Ptr" template="bhkEntity" arr1="Num Entities">The entities affected by this constraint.</add>
         <add name="Priority" type="uint" default="1">Usually 1. Higher values indicate higher priority of this constraint?</add>
     </niobject>
 
-    <niobject name="bhkLimitedHingeConstraint" inherit="bhkConstraint">
+    <niobject name="bhkLimitedHingeConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
         Hinge constraint.
         <add name="Limited Hinge" type="LimitedHingeDescriptor">Describes a limited hinge constraint</add>
     </niobject>
 
-    <niobject name="bhkMalleableConstraint" inherit="bhkConstraint">
+    <niobject name="bhkMalleableConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
         A malleable constraint.
         <add name="Malleable" type="MalleableDescriptor">Constraint within constraint.</add>
     </niobject>
 
-    <niobject name="bhkStiffSpringConstraint" inherit="bhkConstraint">
+    <niobject name="bhkStiffSpringConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
         A spring constraint.
         <add name="Stiff Spring" type="StiffSpringDescriptor">Stiff Spring constraint.</add>
     </niobject>
 
-    <niobject name="bhkRagdollConstraint" inherit="bhkConstraint">
+    <niobject name="bhkRagdollConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
         Ragdoll constraint.
         <add name="Ragdoll" type="RagdollDescriptor">Ragdoll constraint.</add>
     </niobject>
 
-    <niobject name="bhkPrismaticConstraint" inherit="bhkConstraint">
+    <niobject name="bhkPrismaticConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
         A prismatic constraint.
         <add name="Prismatic" type="PrismaticDescriptor">Describes a prismatic constraint</add>
     </niobject>
 
-    <niobject name="bhkHingeConstraint" inherit="bhkConstraint">
+    <niobject name="bhkHingeConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
         A hinge constraint.
         <add name="Hinge" type="HingeDescriptor">Hinge constraing.</add>
     </niobject>
 
-    <niobject name="bhkBallAndSocketConstraint" inherit="bhkConstraint">
+    <niobject name="bhkBallAndSocketConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
         A Ball and Socket Constraint.
         <add name="Ball and Socket" type="BallAndSocketDescriptor">Describes a ball and socket constraint</add>
     </niobject>
 
-    <compound name="ConstraintInfo">
+    <compound name="ConstraintInfo" versions="#BETHESDA#">
         Two Vector4 for pivot in A and B.
         <add name="Pivot In A" type="Vector4" />
         <add name="Pivot In B" type="Vector4" />
     </compound>
 
-    <niobject name="bhkBallSocketConstraintChain" inherit="bhkSerializable">
+    <niobject name="bhkBallSocketConstraintChain" inherit="bhkSerializable" versions="#BETHESDA#">
         A Ball and Socket Constraint chain.
         <add name="Num Pivots" type="uint">Number of pivot points. Divide by 2 to get the number of constraints.</add>
         <add name="Pivots" type="ConstraintInfo" arr1="Num Pivots / 2">Two pivot points A and B for each constraint.</add>
@@ -2525,11 +2525,11 @@
         <add name="Priority" type="uint" />
     </niobject>
 
-    <niobject name="bhkShape" abstract="1" inherit="bhkSerializable">
+    <niobject name="bhkShape" abstract="1" inherit="bhkSerializable" versions="#BETHESDA#">
         A Havok Shape?
     </niobject>
 
-    <niobject name="bhkTransformShape" inherit="bhkShape">
+    <niobject name="bhkTransformShape" inherit="bhkShape" versions="#BETHESDA#">
         Transforms a shape.
         <add name="Shape" type="Ref" template="bhkShape">The shape that this object transforms.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
@@ -2538,21 +2538,21 @@
         <add name="Transform" type="Matrix44">A transform matrix.</add>
     </niobject>
 
-    <niobject name="bhkSphereRepShape" abstract="1" inherit="bhkShape">
+    <niobject name="bhkSphereRepShape" abstract="1" inherit="bhkShape" versions="#BETHESDA#">
         A havok shape, perhaps with a bounding sphere for quick rejection in addition to more detailed shape data?
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float">The radius of the sphere that encloses the shape.</add>
     </niobject>
 
-    <niobject name="bhkConvexShape" abstract="1" inherit="bhkSphereRepShape">
+    <niobject name="bhkConvexShape" abstract="1" inherit="bhkSphereRepShape" versions="#BETHESDA#">
         A havok shape.
     </niobject>
 
-    <niobject name="bhkSphereShape" inherit="bhkConvexShape">
+    <niobject name="bhkSphereShape" inherit="bhkConvexShape" versions="#BETHESDA#">
         A sphere.
     </niobject>
 
-    <niobject name="bhkCapsuleShape" inherit="bhkConvexShape">
+    <niobject name="bhkCapsuleShape" inherit="bhkConvexShape" versions="#BETHESDA#">
         A capsule.
         <add name="Unused" type="byte" arr1="8">Not used. The following wants to be aligned at 16 bytes.</add>
         <add name="First Point" type="Vector3">First point on the capsule's axis.</add>
@@ -2561,14 +2561,14 @@
         <add name="Radius 2" type="float">Matches second capsule radius.</add>
     </niobject>
 
-    <niobject name="bhkBoxShape" inherit="bhkConvexShape">
+    <niobject name="bhkBoxShape" inherit="bhkConvexShape" versions="#BETHESDA#">
         A box.
         <add name="Unused" type="byte" arr1="8">Not used. The following wants to be aligned at 16 bytes.</add>
         <add name="Dimensions" type="Vector3">A cube stored in Half Extents. A unit cube (1.0, 1.0, 1.0) would be stored as 0.5, 0.5, 0.5.</add>
         <add name="Unused Float" type="float">Unused as Havok stores the Half Extents as hkVector4 with the W component unused.</add>
     </niobject>
 
-    <niobject name="bhkConvexVerticesShape" inherit="bhkConvexShape">
+    <niobject name="bhkConvexVerticesShape" inherit="bhkConvexShape" versions="#BETHESDA#">
         A convex shape built from vertices. Note that if the shape is used in
         a non-static object (such as clutter), then they will simply fall
         through ground when they are under a bhkListShape.
@@ -2581,18 +2581,18 @@
     </niobject>
 
     <!--Should inherit from bhkConvexShape according to hierarchy, but seems to be exactly the same as bhkTransformShape.-->
-    <niobject name="bhkConvexTransformShape" inherit="bhkTransformShape">
+    <niobject name="bhkConvexTransformShape" inherit="bhkTransformShape" versions="#BETHESDA#">
         A convex transformed shape?
     </niobject>
 
-    <niobject name="bhkConvexSweepShape" inherit="bhkShape">
+    <niobject name="bhkConvexSweepShape" inherit="bhkShape" versions="V10_0_1_0">
         <add name="Shape" type="Ref" template="bhkShape" />
         <add name="Material" type="HavokMaterial" />
         <add name="Radius" type="float" />
         <add name="Unknown" type="Vector3" />
     </niobject>
 
-    <niobject name="bhkMultiSphereShape" inherit="bhkSphereRepShape">
+    <niobject name="bhkMultiSphereShape" inherit="bhkSphereRepShape" versions="#BETHESDA#">
         Unknown.
         <add name="Unknown Float 1" type="float" />
         <add name="Unknown Float 2" type="float" />
@@ -2600,11 +2600,11 @@
         <add name="Spheres" type="NiBound" arr1="Num Spheres">This array holds the spheres which make up the multi sphere shape.</add>
     </niobject>
 
-    <niobject name="bhkBvTreeShape" abstract="1" inherit="bhkShape">
+    <niobject name="bhkBvTreeShape" abstract="1" inherit="bhkShape" versions="#BETHESDA#">
         A tree-like Havok data structure stored in an assembly-like binary code?
     </niobject>
 
-    <niobject name="bhkMoppBvTreeShape" inherit="bhkBvTreeShape">
+    <niobject name="bhkMoppBvTreeShape" inherit="bhkBvTreeShape" versions="#BETHESDA#">
         Memory optimized partial polytope bounding volume tree shape (not an entity).
         <add name="Shape" type="Ref" template="bhkShape">The shape.</add>
         <add name="Unused" type="uint" arr1="3">Garbage data from memory. Referred to as User Data, Shape Collection, and Code.</add>
@@ -2617,11 +2617,11 @@
     </niobject>
 
 
-    <niobject name="bhkShapeCollection" abstract="1" inherit="bhkShape">
+    <niobject name="bhkShapeCollection" abstract="1" inherit="bhkShape" versions="#BETHESDA#">
         Havok collision object that uses multiple shapes?
     </niobject>
 
-    <niobject name="bhkListShape" inherit="bhkShapeCollection">
+    <niobject name="bhkListShape" inherit="bhkShapeCollection" versions="#BETHESDA#">
         A list of shapes.
 
         Do not put a bhkPackedNiTriStripsShape in the Sub Shapes. Use a
@@ -2646,7 +2646,7 @@
     XXX not completely decoded, also the 4 dummy separator bytes seem
     to be missing from nifs that have this block
     -->
-    <niobject name="bhkMeshShape" inherit="bhkShape">
+    <niobject name="bhkMeshShape" inherit="bhkShape" versions="V10_0_1_0">
         <add name="Unknowns" type="uint" arr1="2" />
         <add name="Radius" type="float" />
         <add name="Unused 2" type="byte" arr1="8" />
@@ -2658,7 +2658,7 @@
         <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data" ver2="10.0.1.0">Refers to a bunch of NiTriStripsData objects that make up this shape.</add>
     </niobject>
 
-    <niobject name="bhkPackedNiTriStripsShape" inherit="bhkShapeCollection">
+    <niobject name="bhkPackedNiTriStripsShape" inherit="bhkShapeCollection" versions="#BETHESDA#">
         A shape constructed from strips data.
         <add name="Num Sub Shapes" type="ushort" ver2="20.0.0.5" />
         <add name="Sub Shapes" type="OblivionSubShape" arr1="Num Sub Shapes" ver2="20.0.0.5" />
@@ -2672,7 +2672,7 @@
         <add name="Data" type="Ref" template="hkPackedNiTriStripsData" />
     </niobject>
 
-    <niobject name="bhkNiTriStripsShape" inherit="bhkShapeCollection">
+    <niobject name="bhkNiTriStripsShape" inherit="bhkShapeCollection" versions="#BETHESDA#">
         A shape constructed from a bunch of strips.
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float" default="0.1" />
@@ -2849,7 +2849,7 @@
         <add name="Bounding Volume" type="BoundingVolume" cond="Use ABV == 1" />
     </niobject>
 
-    <bitflags name="bhkCOFlags" storage="ushort" prefix="BHKCO">
+    <bitflags name="bhkCOFlags" storage="ushort" prefix="BHKCO" versions="#BETHESDA#">
         bhkNiCollisionObject flags. The flags 0x2, 0x100, and 0x200 are not seen in any NIF nor get/set by the engine.
         <option value="0" name="ACTIVE" />
         <!--<option value="1" name="UNK1" />-->
@@ -3274,7 +3274,7 @@
         <option value="15" name="Unk32768" />
     </bitflags>
     
-    <bitflags name="BSVectorFlags" storage="ushort" prefix="BSVF">
+    <bitflags name="BSVectorFlags" storage="ushort" prefix="BSVF" versions="#BETHESDA#">
         <option value="0" name="Has_UV" />
         <option value="1" name="Unk2" />
         <option value="2" name="Unk4" />
@@ -3349,28 +3349,28 @@
         <add name="Keys" type="uint">Seems to be always zero.</add>
     </niobject>
 
-    <niobject name="BSBound" inherit="NiExtraData">
+    <niobject name="BSBound" inherit="NiExtraData" versions="#BETHESDA#">
         Bethesda-specific collision bounding box for skeletons.
         <add name="Center" type="Vector3">Center of the bounding box.</add>
         <add name="Dimensions" type="Vector3">Dimensions of the bounding box from center.</add>
     </niobject>
 
-    <niobject name="BSFurnitureMarker" inherit="NiExtraData">
+    <niobject name="BSFurnitureMarker" inherit="NiExtraData" versions="#BETHESDA#">
         Unknown. Marks furniture sitting positions?
         <add name="Num Positions" type="uint" />
         <add name="Positions" type="FurniturePosition" arr1="Num Positions" />
     </niobject>
 
-    <niobject name="BSParentVelocityModifier" inherit="NiPSysModifier">
+    <niobject name="BSParentVelocityModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
         Particle modifier that adds a blend of object space translation and rotation to particles born in world space.
         <add name="Damping" type="float">Amount of blending?</add>
     </niobject>
 
-    <niobject name="BSPSysArrayEmitter" inherit="NiPSysVolumeEmitter">
+    <niobject name="BSPSysArrayEmitter" inherit="NiPSysVolumeEmitter" versions="#BETHESDA#">
         Particle emitter that uses a node, its children and subchildren to emit from.  Emission will be evenly spread along points from nodes leading to their direct parents/children only.
     </niobject>
 
-    <niobject name="BSWindModifier" inherit="NiPSysModifier">
+    <niobject name="BSWindModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
         Particle Modifier that uses the wind value from the gamedata to alter the path of particles.
         <add name="Strength" type="float">The amount of force wind will have on particles.</add>
     </niobject>
@@ -3599,7 +3599,7 @@
         <add name="Scale Half Range" type="float" default="3.402823466e+38" />
     </niobject>
 	
-	<niobject name="BSRotAccumTransfInterpolator" inherit="NiTransformInterpolator">
+	<niobject name="BSRotAccumTransfInterpolator" inherit="NiTransformInterpolator" versions="#BETHESDA#">
 	</niobject>
 
     <niobject name="NiBSplineData" inherit="NiObject">
@@ -3750,7 +3750,7 @@
         <add name="Integer Data" type="uint">The value of the extra data.</add>
     </niobject>
 
-    <niobject name="BSXFlags" inherit="NiIntegerExtraData">
+    <niobject name="BSXFlags" inherit="NiIntegerExtraData" versions="#BETHESDA#">
         Controls animation and collision.  Integer holds flags:
         Bit 0 : enable havok, bAnimated(Skyrim)
         Bit 1 : enable collision, bHavok(Skyrim)
@@ -3774,7 +3774,7 @@
         <add name="Data" type="uint" arr1="Num Integers">Integers.</add>
     </niobject>
 
-    <niobject name="BSKeyframeController" inherit="NiKeyframeController">
+    <niobject name="BSKeyframeController" inherit="NiKeyframeController" versions="#BETHESDA#">
         An extended keyframe controller.
         <add name="Data 2" type="Ref" template="NiKeyframeData">A link to more keyframe data.</add>
     </niobject>
@@ -4274,24 +4274,24 @@
         <add name="Meshes" type="Ref" template="NiAVObject" arr1="Num Meshes" />
     </niobject>
     
-    <niobject name="BSPSysInheritVelocityModifier" inherit="NiPSysModifier">
+    <niobject name="BSPSysInheritVelocityModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
         <add name="Inherit Object" type="Ptr" template="NiAVObject" />
         <add name="Chance To Inherit" type="float" />
         <add name="Velocity Multiplier" type="float" />
         <add name="Velocity Variation" type="float" />
     </niobject>
     
-    <niobject name="BSPSysHavokUpdateModifier" inherit="NiPSysMeshUpdateModifier">
+    <niobject name="BSPSysHavokUpdateModifier" inherit="NiPSysMeshUpdateModifier" versions="#BETHESDA#">
         <add name="Modifier" type="Ref" template="NiPSysModifier" />
     </niobject>
 
-    <niobject name="BSPSysRecycleBoundModifier" inherit="NiPSysModifier">
+    <niobject name="BSPSysRecycleBoundModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
         <add name="Bound Offset" type="Vector3" />
         <add name="Bound Extent" type="Vector3" />
         <add name="Bound Object" type="Ptr" template="NiAVObject" />
     </niobject> 
     
-    <niobject name="BSPSysSubTexModifier" inherit="NiPSysModifier">
+    <niobject name="BSPSysSubTexModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
         Similar to a Flip Controller, this handles particle texture animation on a single texture atlas
         <add name="Start Frame" type="uint">Starting frame/position on atlas</add>
         <add name="Start Frame Fudge" type="float">Random chance to start on a different frame?</add>
@@ -4393,14 +4393,14 @@
         <add name="Frequency" type="float">How many turbulence updates per second.</add>
     </niobject>
 
-    <niobject name="BSPSysLODModifier" inherit="NiPSysModifier">
+    <niobject name="BSPSysLODModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
         <add name="LOD Begin Distance" type="float" default="0.1" />
         <add name="LOD End Distance" type="float" default="0.7" />
         <add name="End Emit Scale" type="float" default="0.2" />
         <add name="End Size" type="float" default="1.0" />
     </niobject>
     
-    <niobject name="BSPSysScaleModifier" inherit="NiPSysModifier">
+    <niobject name="BSPSysScaleModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
         <add name="Num Scales" type="uint" />
         <add name="Scales" type="float" arr1="Num Scales" />
     </niobject>
@@ -5471,11 +5471,11 @@
         <add name="Adjoiner" type="Ptr" template="NiNode">Root of the scenegraph which is to be seen through this portal.</add>
     </niobject>
 
-    <niobject name="BSFadeNode" inherit="NiNode">
+    <niobject name="BSFadeNode" inherit="NiNode" versions="#FO3_AND_LATER#">
         Bethesda-specific fade node.
     </niobject>
 
-    <enum name="BSShaderType" storage="uint">
+    <enum name="BSShaderType" storage="uint" versions="#FO3#">
         The type of animation interpolation (blending) that will be used on the associated key frames.
         <option value="0" name="SHADER_TALL_GRASS">Tall Grass Shader</option>
         <option value="1" name="SHADER_DEFAULT">Standard Lighting Shader</option>
@@ -5487,7 +5487,7 @@
         <option value="33" name="SHADER_NOLIGHTING">No Lighting Shader</option>
     </enum>
     
-    <bitflags name="BSShaderFlags" storage="uint" prefix="F3SF1">
+    <bitflags name="BSShaderFlags" storage="uint" prefix="F3SF1" versions="#FO3#">
         Shader Property Flags
         <option value="0" name="Specular">Enables Specularity</option>
         <option value="1" name="Skinned">Required For Skinned Meshes</option>
@@ -5523,7 +5523,7 @@
         <option value="31" name="ZBuffer_Test">ZBuffer Test (1=on)</option>
     </bitflags>
 
-    <bitflags name="BSShaderFlags2" storage="uint" prefix="F3SF2">
+    <bitflags name="BSShaderFlags2" storage="uint" prefix="F3SF2" versions="#FO3#">
         Shader Property Flags 2
         <option value="0" name="ZBuffer_Write">ZBuffer Write</option>
         <option value="1" name="LOD_Landscape">LOD Landscape</option>
@@ -5559,7 +5559,7 @@
         <option value="31" name="Unknown10">Unknown</option>
     </bitflags>
     
-    <niobject name="BSShaderProperty" inherit="NiShadeProperty">
+    <niobject name="BSShaderProperty" inherit="NiShadeProperty" versions="#FO3_AND_LATER#">
         Bethesda-specific property.
         <add name="Shader Type" type="BSShaderType" default="SHADER_DEFAULT" vercond="(User Version 2 &lt;= 34)" />
         <add name="Shader Flags" type="BSShaderFlags" default="0x82000000" vercond="(User Version 2 &lt;= 34)" />
@@ -5567,12 +5567,12 @@
         <add name="Environment Map Scale" type="float" default="1.0" vercond="(User Version 2 &lt;= 34)">Scales the intensity of the environment/cube map.</add>
     </niobject>
 
-    <niobject name="BSShaderLightingProperty" abstract="1" inherit="BSShaderProperty">
+    <niobject name="BSShaderLightingProperty" abstract="1" inherit="BSShaderProperty" versions="#FO3#">
         Bethesda-specific property.
         <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" vercond="(User Version 2 &lt;= 34)">How to handle texture borders.</add>
     </niobject>
 
-    <niobject name="BSShaderNoLightingProperty" inherit="BSShaderLightingProperty">
+    <niobject name="BSShaderNoLightingProperty" inherit="BSShaderLightingProperty" versions="#FO3#">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">The texture glow map.</add>
         <add name="Falloff Start Angle" type="float" default="1.0" vercond="(User Version 2 &gt; 26)">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
@@ -5581,7 +5581,7 @@
         <add name="Falloff Stop Opacity" type="float" default="0.0" vercond="(User Version 2 &gt; 26)">Alpha falloff multiplier at end angle</add>
     </niobject>
 
-    <niobject name="BSShaderPPLightingProperty" inherit="BSShaderLightingProperty">
+    <niobject name="BSShaderPPLightingProperty" inherit="BSShaderLightingProperty" versions="#FO3#">
         Bethesda-specific property.
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set</add>
         <add name="Refraction Strength" type="float" default="0.0" vercond="(User Version 2 &gt; 14)">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
@@ -5593,29 +5593,29 @@
     </niobject>
 
     <!-- Skyrim specific Node -->
-    <niobject name="BSEffectShaderPropertyFloatController" inherit="NiFloatInterpController">
+    <niobject name="BSEffectShaderPropertyFloatController" inherit="NiFloatInterpController" versions="#SKY_AND_LATER#">
         This controller is used to animate float variables in BSEffectShaderProperty.
         <add name="Type of Controlled Variable" type="EffectShaderControlledVariable">Which float variable in BSEffectShaderProperty to animate:</add>
     </niobject>
 	
-	<niobject name="BSEffectShaderPropertyColorController" inherit="NiPoint3InterpController">
+	<niobject name="BSEffectShaderPropertyColorController" inherit="NiPoint3InterpController" versions="#SKY_AND_LATER#">
 		This controller is used to animate colors in BSEffectShaderProperty.
 		<add name="Type of Controlled Color" type="EffectShaderControlledColor">Which color in BSEffectShaderProperty to animate:</add>
 	</niobject>
 	
-	<niobject name="BSLightingShaderPropertyFloatController" inherit="NiFloatInterpController">
+	<niobject name="BSLightingShaderPropertyFloatController" inherit="NiFloatInterpController" versions="#SKY_AND_LATER#">
 		This controller is used to animate float variables in BSLightingShaderProperty.
 		<add name="Type of Controlled Variable" type="LightingShaderControlledVariable">Which float variable in BSLightingShaderProperty to animate:</add>
 	</niobject>
 	
-	<niobject name="BSLightingShaderPropertyColorController" inherit="NiPoint3InterpController">
+	<niobject name="BSLightingShaderPropertyColorController" inherit="NiPoint3InterpController" versions="#SKY_AND_LATER#">
 		This controller is used to animate colors in BSLightingShaderProperty.
 		<add name="Type of Controlled Color" type="LightingShaderControlledColor">Which color in BSLightingShaderProperty to animate:</add>
 	</niobject>	
 	
-	<niobject name="BSNiAlphaPropertyTestRefController" inherit="NiFloatInterpController" />
+	<niobject name="BSNiAlphaPropertyTestRefController" inherit="NiFloatInterpController" versions="#BETHESDA#" />
 	
-	<niobject name="BSProceduralLightningController" inherit="NiTimeController">
+	<niobject name="BSProceduralLightningController" inherit="NiTimeController" versions="#BETHESDA#">
     Skyrim, Paired with dummy TriShapes, this controller generates lightning shapes for special effects.
     First interpolator controls Generation.
         <add name="Interpolator 1: Generation" type="Ref" template="NiInterpolator">References generation interpolator.</add>
@@ -5641,7 +5641,7 @@
         <add name="Shader Property" type="Ref" template="BSShaderProperty">Reference to a shader property.</add>
 	</niobject>
 
-   <niobject name="BSShaderTextureSet" inherit="NiObject">
+   <niobject name="BSShaderTextureSet" inherit="NiObject" versions="#BETHESDA#">
         Bethesda-specific Texture Set.
         <add name="Num Textures" type="int" default="6" />
         <add name="Textures" type="SizedString" arr1="Num Textures">Textures.
@@ -5656,11 +5656,11 @@
         </add>
     </niobject>
 
-    <niobject name="WaterShaderProperty" inherit="BSShaderProperty">
+    <niobject name="WaterShaderProperty" inherit="BSShaderProperty" versions="#FO3_AND_LATER#">
         Bethesda-specific property. Found in Fallout3
     </niobject>
 
-    <enum name="SkyObjectType" storage="uint">
+    <enum name="SkyObjectType" storage="uint" versions="#BETHESDA#">
         Sets what sky function this object fulfills in BSSkyShaderProperty or SkyShaderProperty.
         <option value="0" name="BSSM_SKY_TEXTURE">BSSM_Sky_Texture</option>
         <option value="1" name="BSSM_SKY_SUNGLARE">BSSM_Sky_Sunglare</option>
@@ -5669,43 +5669,43 @@
         <option value="5" name="BSSM_SKY_STARS">BSSM_Sky_Stars</option>
         <option value="7" name="BSSM_SKY_MOON_STARS_MASK">BSSM_Sky_Moon_Stars_Mask</option>
     </enum>
-    <niobject name="SkyShaderProperty" inherit="BSShaderLightingProperty">
+    <niobject name="SkyShaderProperty" inherit="BSShaderLightingProperty" versions="#BETHESDA#">
         Bethesda-specific property. Found in Fallout3
         <add name="File Name" type="SizedString">The texture.</add>
         <add name="Sky Object Type" type="SkyObjectType">Sky Object Type</add>
     </niobject>
 
-    <niobject name="TileShaderProperty" inherit="BSShaderLightingProperty">
+    <niobject name="TileShaderProperty" inherit="BSShaderLightingProperty" versions="#FO3#">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">Texture file name</add>
     </niobject>
 
-    <niobject name="DistantLODShaderProperty" inherit="BSShaderProperty">
+    <niobject name="DistantLODShaderProperty" inherit="BSShaderProperty" versions="#BETHESDA#">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="BSDistantTreeShaderProperty" inherit="BSShaderProperty">
+    <niobject name="BSDistantTreeShaderProperty" inherit="BSShaderProperty" versions="#FO3_AND_LATER#">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="TallGrassShaderProperty" inherit="BSShaderProperty">
+    <niobject name="TallGrassShaderProperty" inherit="BSShaderProperty" versions="#BETHESDA#">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">Texture file name</add>
     </niobject>
 
-    <niobject name="VolumetricFogShaderProperty" inherit="BSShaderProperty">
+    <niobject name="VolumetricFogShaderProperty" inherit="BSShaderProperty" versions="#FO3_AND_LATER#">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="HairShaderProperty" inherit="BSShaderProperty">
+    <niobject name="HairShaderProperty" inherit="BSShaderProperty" versions="#BETHESDA#">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="Lighting30ShaderProperty" inherit="BSShaderPPLightingProperty">
+    <niobject name="Lighting30ShaderProperty" inherit="BSShaderPPLightingProperty" versions="#BETHESDA#">
         Bethesda-specific property.
     </niobject>
 
-    <bitflags name="SkyrimShaderPropertyFlags1" storage="uint" prefix="SLSF1">
+    <bitflags name="SkyrimShaderPropertyFlags1" storage="uint" prefix="SLSF1" versions="#SKY# #SSE#">
         Skyrim Shader Property Flags 1
         <option value="0" name="Specular">Enables Specularity</option>
         <option value="1" name="Skinned">Required For Skinned Meshes.</option>
@@ -5741,7 +5741,7 @@
         <option value="31" name="ZBuffer_Test">ZBuffer Test (1=on)</option>
     </bitflags>
     
-    <bitflags name="SkyrimShaderPropertyFlags2" storage="uint" prefix="SLSF2">
+    <bitflags name="SkyrimShaderPropertyFlags2" storage="uint" prefix="SLSF2" versions="#SKY# #SSE#">
         Skyrim Shader Property Flags 2
         <option value="0" name="ZBuffer_Write">Enables writing to the Z-Buffer</option>
         <option value="1" name="LOD_Landscape"></option>
@@ -5777,7 +5777,7 @@
         <option value="31" name="HD_LOD_Objects"></option>
     </bitflags>
 
-    <bitflags name="Fallout4ShaderPropertyFlags1" storage="uint" prefix="F4SF1">
+    <bitflags name="Fallout4ShaderPropertyFlags1" storage="uint" prefix="F4SF1" versions="#FO4#">
         Fallout 4 Shader Property Flags 1
         <option value="0" name="Specular" />
         <option value="1" name="Skinned" />
@@ -5813,7 +5813,7 @@
         <option value="31" name="ZBuffer_Test" />
     </bitflags>
     
-    <bitflags name="Fallout4ShaderPropertyFlags2" storage="uint" prefix="F4SF2">
+    <bitflags name="Fallout4ShaderPropertyFlags2" storage="uint" prefix="F4SF2" versions="#FO4#">
         Fallout 4 Shader Property Flags 2
         <option value="0" name="ZBuffer_Write" />
         <option value="1" name="LOD_Landscape" />
@@ -5849,7 +5849,7 @@
         <option value="31" name="Refraction_Writes_Depth" />
     </bitflags>
 
-    <niobject name="BSLightingShaderProperty" inherit="BSShaderProperty">
+    <niobject name="BSLightingShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Bethesda shader property for Skyrim and later.
         <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="(User Version 2 != 130)" default="2185233153">Skyrim Shader Flags for setting render/shader options.</add>
         <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="(User Version 2 != 130)" default="32801">Skyrim Shader Flags for setting render/shader options.</add>
@@ -5898,7 +5898,7 @@
         <add name="Right Eye Reflection Center" type="Vector3" cond="Skyrim Shader Type == 16">Offset to set center for right eye cubemap</add>
     </niobject>
 
-    <niobject name="BSEffectShaderProperty" inherit="BSShaderProperty">
+    <niobject name="BSEffectShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Bethesda effect shader property for Skyrim and later.
         <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="2147483648" vercond="(User Version 2 != 130)" />
         <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="32" vercond="(User Version 2 != 130)" />
@@ -5927,7 +5927,7 @@
         <add name="Environment Map Scale" type="float" vercond="(User Version 2 == 130)" />
     </niobject>
     
-    <bitflags name="SkyrimWaterShaderFlags" storage="byte">
+    <bitflags name="SkyrimWaterShaderFlags" storage="byte" versions="#SKY_AND_LATER#">
         Skyrim water shader property flags
         <option value="0" name="SWSF1_UNKNOWN0">Unknown</option>
         <option value="1" name="SWSF1_Bypass_Refraction_Map">Bypasses refraction map when set to 1</option>
@@ -5939,7 +5939,7 @@
         <option value="7" name="SWSF1_Enabled">Water layer on/off</option>
     </bitflags>
     
-    <niobject name="BSWaterShaderProperty" inherit="BSShaderProperty">
+    <niobject name="BSWaterShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Skyrim water shader property, different from "WaterShaderProperty" seen in Fallout.
         <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1"></add>
         <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2"></add>
@@ -5950,7 +5950,7 @@
         <add name="Unknown Short 3" type="ushort" /> 
     </niobject>
     
-    <niobject name="BSSkyShaderProperty" inherit="BSShaderProperty">
+    <niobject name="BSSkyShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Skyrim Sky shader block.
         <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1"></add>
         <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2"></add>
@@ -5960,19 +5960,19 @@
         <add name="Sky Object Type" type="SkyObjectType" />
     </niobject>
 
-    <niobject name="BSDismemberSkinInstance" inherit="NiSkinInstance">
+    <niobject name="BSDismemberSkinInstance" inherit="NiSkinInstance" versions="#BETHESDA#">
         Bethesda-specific skin instance.
         <add name="Num Partitions" type="int" />
         <add name="Partitions" type="BodyPartList" arr1="Num Partitions" />
     </niobject>
 
-    <niobject name="BSDecalPlacementVectorExtraData" inherit="NiFloatExtraData">
+    <niobject name="BSDecalPlacementVectorExtraData" inherit="NiFloatExtraData" versions="#FO3_AND_LATER#">
         Bethesda-specific extra data. Lists locations and normals on a mesh that are appropriate for decal placement.
         <add name="Num Vector Blocks" type="short" />
         <add name="Vector Blocks" type="DecalVectorArray" arr1="Num Vector Blocks" />
     </niobject>
 
-    <niobject name="BSPSysSimpleColorModifier" inherit="NiPSysModifier">
+    <niobject name="BSPSysSimpleColorModifier" inherit="NiPSysModifier" versions="#FO3_AND_LATER#">
         Bethesda-specific particle modifier.
         <add name="Fade In Percent" type="float" />
         <add name="Fade out Percent" type="float" />
@@ -5984,25 +5984,25 @@
     </niobject>
 
 
-    <bitflags name="BSValueNodeFlags" storage="byte">
+    <bitflags name="BSValueNodeFlags" storage="byte" versions="#FO3_AND_LATER#">
         Flags for BSValueNode.
         <option value="0" name="BillboardWorldZ" />
         <option value="1" name="UsePlayerAdjust" />
     </bitflags>
 
-    <niobject name="BSValueNode" inherit="NiNode">
+    <niobject name="BSValueNode" inherit="NiNode" versions="#FO3_AND_LATER#">
         Bethesda-specific node. Found on fxFire effects
         <add name="Value" type="uint" />
         <add name="Value Node Flags" type="BSValueNodeFlags" />
     </niobject>
 
 
-    <niobject name="BSStripParticleSystem" inherit="NiParticleSystem">
+    <niobject name="BSStripParticleSystem" inherit="NiParticleSystem" versions="#FO3_AND_LATER#">
         Bethesda-Specific (mesh?) Particle System.
     </niobject>
 
 
-    <niobject name="BSStripPSysData" inherit="NiPSysData">
+    <niobject name="BSStripPSysData" inherit="NiPSysData" versions="#FO3_AND_LATER#">
         Bethesda-Specific (mesh?) Particle System Data.
         <add name="Max Point Count" type="ushort" />
         <add name="Start Cap Size" type="float" />
@@ -6011,19 +6011,19 @@
     </niobject>
 
 
-    <niobject name="BSPSysStripUpdateModifier" inherit="NiPSysModifier">
+    <niobject name="BSPSysStripUpdateModifier" inherit="NiPSysModifier" versions="#FO3_AND_LATER#">
         Bethesda-Specific (mesh?) Particle System Modifier.
         <add name="Update Delta Time" type="float" />
     </niobject>
 
 
-    <niobject name="BSMaterialEmittanceMultController" inherit="NiFloatInterpController">
+    <niobject name="BSMaterialEmittanceMultController" inherit="NiFloatInterpController" versions="#FO3#">
         Bethesda-Specific time controller.
     </niobject>
 
 
 
-    <niobject name="BSMasterParticleSystem" inherit="NiNode">
+    <niobject name="BSMasterParticleSystem" inherit="NiNode" versions="#FO3_AND_LATER#">
         Bethesda-Specific particle system.
         <add name="Max Emitter Objects" type="ushort" />
         <add name="Num Particle Systems" type="int" />
@@ -6032,47 +6032,47 @@
     </niobject>
 
 
-    <niobject name="BSPSysMultiTargetEmitterCtlr" inherit="NiPSysEmitterCtlr">
+    <niobject name="BSPSysMultiTargetEmitterCtlr" inherit="NiPSysEmitterCtlr" versions="#FO3_AND_LATER#">
         Particle system (multi?) emitter controller.
         <add name="Max Emitters" type="ushort" />
         <add name="Master Particle System" type="Ptr" template="BSMasterParticleSystem" />
     </niobject>
 
 
-    <niobject name="BSRefractionStrengthController" inherit="NiFloatInterpController">
+    <niobject name="BSRefractionStrengthController" inherit="NiFloatInterpController" versions="#FO3#">
         Bethesda-Specific time controller.
     </niobject>
 
 
-    <niobject name="BSOrderedNode" inherit="NiNode">
+    <niobject name="BSOrderedNode" inherit="NiNode" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
         <add name="Alpha Sort Bound" type="Vector4" />
         <add name="Static Bound" type="bool" />
     </niobject>
 
 
-    <niobject name="BSRangeNode" inherit="NiNode">
+    <niobject name="BSRangeNode" inherit="NiNode" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
         <add name="Min" type="byte" />
         <add name="Max" type="byte" />
         <add name="Current" type="byte" />
     </niobject>
 
-    <niobject name="BSBlastNode" inherit="BSRangeNode">
+    <niobject name="BSBlastNode" inherit="BSRangeNode" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
     </niobject>
 
-    <niobject name="BSDamageStage" inherit="BSBlastNode">
+    <niobject name="BSDamageStage" inherit="BSBlastNode" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
     </niobject>
 
 
-    <niobject name="BSRefractionFirePeriodController" inherit="NiTimeController">
+    <niobject name="BSRefractionFirePeriodController" inherit="NiTimeController" versions="#FO3#">
         Bethesda-specific time controller.
         <add name="Interpolator" type="Ref" template="NiInterpolator" ver1="20.2.0.7" />
     </niobject>
 
-    <niobject name="bhkConvexListShape" inherit="bhkShape">
+    <niobject name="bhkConvexListShape" inherit="bhkShape" versions="#FO3#">
         A havok shape.
         A list of convex shapes.
 
@@ -6092,28 +6092,28 @@
         <add name="Unknown Float 2" type="float" />
     </niobject>
 
-    <compound name="BSTreadTransform">
+    <compound name="BSTreadTransform" versions="#FO3_AND_LATER#">
         Bethesda-specific compound.
         <add name="Name" type="string" />
         <add name="Transform 1" type="NiQuatTransform" />
         <add name="Transform 2" type="NiQuatTransform" />
     </compound>
 
-    <niobject name="BSTreadTransfInterpolator" inherit="NiInterpolator">
+    <niobject name="BSTreadTransfInterpolator" inherit="NiInterpolator" versions="#FO3_AND_LATER#">
         Bethesda-specific interpolator.
         <add name="Num Tread Transforms" type="int" />
         <add name="Tread Transforms" type="BSTreadTransform" arr1="Num Tread Transforms" />
         <add name="Data" type="Ref" template="NiFloatData" />
     </niobject>
 
-    <enum name="AnimNoteType" storage="uint">
+    <enum name="AnimNoteType" storage="uint" versions="#FO3_AND_LATER#">
         Anim note types.
         <option value="0" name="ANT_INVALID">ANT_INVALID</option>
         <option value="1" name="ANT_GRABIK">ANT_GRABIK</option>
         <option value="2" name="ANT_LOOKIK">ANT_LOOKIK</option>
     </enum>
 
-    <niobject name="BSAnimNote" inherit="NiObject">
+    <niobject name="BSAnimNote" inherit="NiObject" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
         <add name="Type" type="AnimNoteType">Type of this note.</add>
         <add name="Time" type="float">Location in time.</add>
@@ -6122,13 +6122,13 @@
         <add name="State" type="uint" cond="Type == 2" />
     </niobject>
 
-    <niobject name="BSAnimNotes" inherit="NiObject">
+    <niobject name="BSAnimNotes" inherit="NiObject" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
         <add name="Num Anim Notes" type="ushort">Number of BSAnimNote objects.</add>
         <add name="Anim Notes" type="Ref" template="BSAnimNote" arr1="Num Anim Notes">BSAnimNote objects.</add>
     </niobject>
 
-    <niobject name="bhkLiquidAction" inherit="bhkSerializable">
+    <niobject name="bhkLiquidAction" inherit="bhkSerializable" versions="#FO3_AND_LATER#">
         Bethesda-specific Havok serializable.
         <add name="User Data" type="uint" />
         <add name="Unknown Int 2" type="int" />
@@ -6139,7 +6139,7 @@
         <add name="Neighbor Strength" type="float" />
     </niobject>
 
-    <enum name="BSCPCullingType" storage="uint">
+    <enum name="BSCPCullingType" storage="uint" versions="#FO3_AND_LATER#">
         Culling modes for multi bound nodes.
         <option value="0" name="BSCP_CULL_NORMAL">Normal</option>
         <option value="1" name="BSCP_CULL_ALLPASS">All Pass</option>
@@ -6148,35 +6148,35 @@
         <option value="4" name="BSCP_CULL_FORCEMULTIBOUNDSNOUPDATE">Force Multi Bounds No Update</option>
     </enum>
 
-    <niobject name="BSMultiBoundNode" inherit="NiNode">
+    <niobject name="BSMultiBoundNode" inherit="NiNode" versions="#FO3_AND_LATER#">
         Bethesda-specific node.
         <add name="Multi Bound" type="Ref" template="BSMultiBound" />
 		<add name="Culling Mode" type="BSCPCullingType" vercond="(User Version 2 &gt;= 83)" />
     </niobject>
 
-    <niobject name="BSMultiBound" inherit="NiObject">
+    <niobject name="BSMultiBound" inherit="NiObject" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
         <add name="Data" type="Ref" template="BSMultiBoundData" />
     </niobject>
 
-    <niobject name="BSMultiBoundData" inherit="NiObject">
+    <niobject name="BSMultiBoundData" inherit="NiObject" versions="#FO3_AND_LATER#">
         Abstract base type for bounding data.
     </niobject>
 
-    <niobject name="BSMultiBoundOBB" inherit="BSMultiBoundData">
+    <niobject name="BSMultiBoundOBB" inherit="BSMultiBoundData" versions="#FO3_AND_LATER#">
         Oriented bounding box.
         <add name="Center" type="Vector3">Center of the box.</add>
         <add name="Size" type="Vector3">Size of the box along each axis.</add>
         <add name="Rotation" type="Matrix33">Rotation of the bounding box.</add>
     </niobject>
     
-    <niobject name="BSMultiBoundSphere" inherit="BSMultiBoundData">
+    <niobject name="BSMultiBoundSphere" inherit="BSMultiBoundData" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
         <add name="Center" type="Vector3" />
         <add name="Radius" type="float" />
     </niobject>
 
-    <compound name="BSGeometrySubSegment">
+    <compound name="BSGeometrySubSegment" versions="#FO3_AND_LATER#">
         This is only defined because of recursion issues.
         <add name="Start Index" type="uint" />
         <add name="Num Primitives" type="uint" />
@@ -6184,7 +6184,7 @@
         <add name="Unused" type="uint" />
     </compound>
 
-    <compound name="BSGeometrySegmentData">
+    <compound name="BSGeometrySegmentData" versions="#FO3_AND_LATER#">
         Bethesda-specific. Describes groups of triangles either segmented in a grid (for LOD) or by body part for skinned FO4 meshes.
         <add name="Flags" type="byte" vercond="(User Version 2 &lt; 130)" />
         <add name="Index" type="uint" vercond="(User Version 2 &lt; 130)">Index = previous Index + previous Num Tris in Segment * 3</add>
@@ -6196,13 +6196,13 @@
         <add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="User Version 2 == 130" />
     </compound>
 
-    <niobject name="BSSegmentedTriShape" inherit="NiTriShape">
+    <niobject name="BSSegmentedTriShape" inherit="NiTriShape" versions="#FO3_AND_LATER#">
         Bethesda-specific AV object.
         <add name="Num Segments" type="int" >Number of segments in the square grid</add>
         <add name="Segment" type="BSGeometrySegmentData" arr1="Num Segments">Configuration of each segment</add>
     </niobject>
 
-    <niobject name="BSMultiBoundAABB" inherit="BSMultiBoundData">
+    <niobject name="BSMultiBoundAABB" inherit="BSMultiBoundData" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
         <add name="Position" type="Vector3">Position of the AABB's center</add>
         <add name="Extent" type="Vector3">Extent of the AABB in all directions</add>
@@ -6230,7 +6230,7 @@
         <add name="Data" type="byte" arr1="Num Data" arr2="Block Size" cond="Has Data" />
     </compound>
 
-    <compound name="BSPackedAdditionalDataBlock">
+    <compound name="BSPackedAdditionalDataBlock" versions="#BETHESDA#">
         <!-- see Fallout NV (nvdlc01vaultposter01.nif) -->
         <add name="Has Data" type="bool">Has data</add>
         <add name="Num Total Bytes" type="int" cond="Has Data">Total number of bytes (over all channels and all elements, equals num total bytes per element times num vertices).</add>
@@ -6253,7 +6253,7 @@
     </niobject>
 
     <!-- Fallout NV (nvdlc01vaultposter01.nif) -->
-    <niobject name="BSPackedAdditionalGeometryData" inherit="AbstractAdditionalGeometryData">
+    <niobject name="BSPackedAdditionalGeometryData" inherit="AbstractAdditionalGeometryData" versions="#BETHESDA#">
         <add name="Num Vertices" type="ushort" />
         <add name="Num Block Infos" type="uint">Information about additional data blocks</add>
         <add name="Block Infos" type="AdditionalDataInfo" arr1="Num Block Infos">Number of additional data blocks</add>
@@ -6261,35 +6261,35 @@
         <add name="Blocks" type="BSPackedAdditionalDataBlock" arr1="Num Blocks">Number of additional data blocks</add>
     </niobject>
 
-    <niobject name="BSWArray" inherit="NiExtraData">
+    <niobject name="BSWArray" inherit="NiExtraData" versions="#FO3_AND_LATER#">
         Bethesda-specific extra data.
         <add name="Num Items" type="int" />
         <add name="Items" type="int" arr1="Num Items" />
     </niobject>
 
-    <niobject name="bhkAabbPhantom" inherit="bhkShapePhantom">
+    <niobject name="bhkAabbPhantom" inherit="bhkShapePhantom" versions="#BETHESDA#">
         Bethesda-specific Havok serializable.
         <add name="Unused Bytes 3" type="byte" arr1="8" />
         <add name="AABB Min" type="Vector4" />
         <add name="AABB Max" type="Vector4" />
     </niobject>
 
-    <niobject name="BSFrustumFOVController" inherit="NiFloatInterpController">
+    <niobject name="BSFrustumFOVController" inherit="NiFloatInterpController" versions="#BETHESDA#">
         Bethesda-specific time controller.
     </niobject>
 
-    <niobject name="BSDebrisNode" inherit="BSRangeNode">
+    <niobject name="BSDebrisNode" inherit="BSRangeNode" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
     </niobject>
 
-    <niobject name="bhkBreakableConstraint" inherit="bhkConstraint">
+    <niobject name="bhkBreakableConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
         A breakable constraint.
         <add name="Constraint Data" type="ConstraintData">Constraint within constraint.</add>
         <add name="Threshold" type="float">Amount of force to break the rigid bodies apart?</add>
         <add name="Remove When Broken" type="bool" default="0">No: Constraint stays active. Yes: Constraint gets removed when breaking threshold is exceeded.</add>
     </niobject>
 
-    <niobject name="bhkOrientHingedBodyAction" inherit="bhkSerializable">
+    <niobject name="bhkOrientHingedBodyAction" inherit="bhkSerializable" versions="#BETHESDA#">
         Bethesda-Specific Havok serializable.
         <add name="Body" type="Ptr" template="bhkRigidBody" />
         <add name="Unknown Int 1" type="uint" />
@@ -6302,7 +6302,7 @@
         <add name="Unused 2" type="byte" arr1="8" />
     </niobject>
 
-    <niobject name="bhkPoseArray" inherit="NiObject">
+    <niobject name="bhkPoseArray" inherit="NiObject" versions="#FO3_AND_LATER#">
         Found in Fallout 3 .psa files, extra ragdoll info for NPCs/creatures. (usually idleanims\deathposes.psa)
         Defines different kill poses. The game selects the pose randomly and applies it to a skeleton immediately upon ragdolling.
         Poses can be previewed in GECK Object Window-Actor Data-Ragdoll and selecting Pose Matching tab.
@@ -6312,13 +6312,13 @@
         <add name="Poses" type="BonePose" arr1="Num Poses" />
     </niobject>
 
-    <niobject name="bhkRagdollTemplate" inherit="NiExtraData">
+    <niobject name="bhkRagdollTemplate" inherit="NiExtraData" versions="#FO3_AND_LATER#">
         Found in Fallout 3, more ragdoll info?  (meshes\ragdollconstraint\*.rdt)
         <add name="Num Bones" type="int" />
         <add name="Bones" type="Ref" template="NiObject" arr1="Num Bones" />
     </niobject>
 
-    <niobject name="bhkRagdollTemplateData" inherit="NiObject">
+    <niobject name="bhkRagdollTemplateData" inherit="NiObject" versions="#FO3_AND_LATER#">
         Data for bhkRagdollTemplate
         <add name="Name" type="string" />
         <add name="Mass" type="float" default="9.0" />
@@ -7348,7 +7348,7 @@
     </niobject>
 
     <!-- Skyrim specific havok block -->
-    <niobject name="bhkCompressedMeshShape" inherit="bhkShape">
+    <niobject name="bhkCompressedMeshShape" inherit="bhkShape" versions="#SKY_AND_LATER#">
         Compressed collision mesh.
         <add name="Target" type="Ptr" template="NiAVObject">Points to root node?</add>
         <add name="User Data" type="uint" />
@@ -7360,7 +7360,7 @@
         <add name="Data" type="Ref" template="bhkCompressedMeshShapeData">The collision mesh data.</add>
     </niobject>
 
-    <niobject name="bhkCompressedMeshShapeData" inherit="bhkRefObject">
+    <niobject name="bhkCompressedMeshShapeData" inherit="bhkRefObject" versions="#SKY_AND_LATER#">
          A compressed mesh shape for collision in Skyrim.
 		<add name="Bits Per Index" type="uint">Number of bits in the shape-key reserved for a triangle index</add>
 		<add name="Bits Per W Index" type="uint">Number of bits in the shape-key reserved for a triangle index and its winding</add>
@@ -7392,7 +7392,7 @@
 	</niobject>
 	
     <!-- Skyrim specific blocks -->
-    <niobject name="BSInvMarker" inherit="NiExtraData">
+    <niobject name="BSInvMarker" inherit="NiExtraData" versions="#SKY_AND_LATER#">
     Orientation marker for Skyrim's inventory view.
         How to show the nif in the player's inventory.
         Typically attached to the root node of the nif tree.
@@ -7406,41 +7406,41 @@
         <add name="Zoom" type="float" default="1.0">Zoom factor.</add>
     </niobject>
 
-	<niobject name="BSBoneLODExtraData" inherit="NiExtraData">
+	<niobject name="BSBoneLODExtraData" inherit="NiExtraData" versions="#SKY_AND_LATER#">
     Unknown
 		<add name="BoneLOD Count" type="uint">Number of bone entries</add>
         <add name="BoneLOD Info" type="BoneLOD" arr1="BoneLOD Count">Bone Entry</add>
 	</niobject>
 	
-	<niobject name="BSBehaviorGraphExtraData" inherit="NiExtraData">
+	<niobject name="BSBehaviorGraphExtraData" inherit="NiExtraData" versions="#SKY_AND_LATER#">
     Links a nif with a Havok Behavior .hkx animation file
 		<add name="Behaviour Graph File" type="string">Name of the hkx file.</add>
 		<add name="Controls Base Skeleton" type="bool">Unknown, has to do with blending appended bones onto an actor.</add>
 	</niobject>
 
-	<niobject name="BSLagBoneController" inherit="NiTimeController">
+	<niobject name="BSLagBoneController" inherit="NiTimeController" versions="#SKY_AND_LATER#">
     A controller that trails a bone behind an actor.
 		<add name="Linear Velocity" type="float">How long it takes to rotate about an actor back to rest position.</add>
 		<add name="Linear Rotation" type="float">How the bone lags rotation</add>
 		<add name="Maximum Distance" type="float">How far bone will tail an actor.</add>
 	</niobject>
 
-	<niobject name="BSLODTriShape" inherit="NiTriBasedGeom">
+	<niobject name="BSLODTriShape" inherit="NiTriBasedGeom" versions="#SKY# #SSE#">
 		A variation on NiTriShape, for visibility control over vertex groups.
 		<add name="LOD0 Size" type="uint" />
 		<add name="LOD1 Size" type="uint" />
 		<add name="LOD2 Size" type="uint" />
 	</niobject>
 
-	<niobject name="BSFurnitureMarkerNode" inherit="BSFurnitureMarker">
+	<niobject name="BSFurnitureMarkerNode" inherit="BSFurnitureMarker" versions="#SKY_AND_LATER#">
         Furniture Marker for actors
     </niobject>
 	
-    <niobject name="BSLeafAnimNode" inherit="NiNode">
+    <niobject name="BSLeafAnimNode" inherit="NiNode" versions="#BETHESDA#">
         Unknown, related to trees.
     </niobject>
     
-    <niobject name="BSTreeNode" inherit="NiNode">
+    <niobject name="BSTreeNode" inherit="NiNode" versions="#BETHESDA#">
         Node for handling Trees, Switches branch configurations for variation?
         <add name="Num Bones 1" type="uint" />
         <add name="Bones 1" type="Ref" arr1="Num Bones 1" template="NiNode" />
@@ -7451,7 +7451,7 @@
     
     <!-- Fallout 4 Geometry -->
     
-    <niobject name="BSTriShape" inherit="NiAVObject" versions="V20_2_0_7_FO4 V20_2_0_7_SSE">
+    <niobject name="BSTriShape" inherit="NiAVObject" versions="#SSE# #FO4#">
         Fallout 4 Tri Shape
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Skin" type="Ref" template="NiObject" />
@@ -7471,21 +7471,21 @@
         <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" vercond="User Version 2 == 100" />
     </niobject>
 
-    <niobject name="BSMeshLODTriShape" inherit="BSTriShape" versions="V20_2_0_7_FO4">
+    <niobject name="BSMeshLODTriShape" inherit="BSTriShape" versions="#FO4#">
         Fallout 4 LOD Tri Shape
         <add name="LOD0 Size" type="uint" />
         <add name="LOD1 Size" type="uint" />
         <add name="LOD2 Size" type="uint" />
     </niobject>
     
-    <compound name="BSGeometryPerSegmentSharedData" versions="V20_2_0_7_FO4">
+    <compound name="BSGeometryPerSegmentSharedData" versions="#FO4#">
         <add name="User Index" type="uint">If Bone ID is 0xffffffff, this value refers to the Segment at the listed index. Otherwise this is the "Biped Object", which is like the body part types in Skyrim and earlier.</add>
         <add name="Bone ID" type="uint">A hash of the bone name string.</add>
         <add name="Num Cut Offsets" type="uint">Maximum of 8.</add>
         <add name="Cut Offsets" type="float" arr1="Num Cut Offsets" />
     </compound>
 
-    <compound name="BSGeometrySegmentSharedData" versions="V20_2_0_7_FO4">
+    <compound name="BSGeometrySegmentSharedData" versions="#FO4#">
         <add name="Num Segments" type="uint" />
         <add name="Total Segments" type="uint" />
         <add name="Segment Starts" type="uint" arr1="Num Segments" />
@@ -7495,7 +7495,7 @@
         <add name="SSF File" type="byte" arr1="SSF Length" />
     </compound>
 
-    <niobject name="BSSubIndexTriShape" inherit="BSTriShape" versions="V20_2_0_7_FO4 V20_2_0_7_SSE">
+    <niobject name="BSSubIndexTriShape" inherit="BSTriShape" versions="#SSE# #FO4#">
         Fallout 4 Sub-Index Tri Shape
 		<add name="Num Primitives" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
 		<add name="Num Segments" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
@@ -7508,11 +7508,11 @@
     
     <!-- Fallout 4 Physics -->
 
-    <niobject name="bhkSystem" abstract="1" inherit="NiObject" versions="V20_2_0_7_FO4">
+    <niobject name="bhkSystem" abstract="1" inherit="NiObject" versions="#FO4#">
         Fallout 4 Physics System
     </niobject>
     
-    <niobject name="bhkNPCollisionObject" inherit="NiCollisionObject" versions="V20_2_0_7_FO4">
+    <niobject name="bhkNPCollisionObject" inherit="NiCollisionObject" versions="#FO4#">
         Fallout 4 Collision Object
         <add name="Flags" type="ushort">
             Due to inaccurate reporting in the CK the Reset and Sync On Update positions are a guess.
@@ -7522,28 +7522,28 @@
         <add name="Body ID" type="uint" />
     </niobject>
     
-    <niobject name="bhkPhysicsSystem" inherit="bhkSystem" versions="V20_2_0_7_FO4">
+    <niobject name="bhkPhysicsSystem" inherit="bhkSystem" versions="#FO4#">
         Fallout 4 Collision System
         <add name="Binary Data" type="ByteArray" />
     </niobject>
 
-    <niobject name="bhkRagdollSystem" inherit="bhkSystem" versions="V20_2_0_7_FO4">
+    <niobject name="bhkRagdollSystem" inherit="bhkSystem" versions="#FO4#">
         Fallout 4 Ragdoll System
         <add name="Binary Data" type="ByteArray" />
     </niobject>
 
-    <niobject name="BSExtraData" inherit="NiExtraData" versions="V20_2_0_7_FO4">
+    <niobject name="BSExtraData" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Extra Data
     </niobject>
 
-    <niobject name="BSClothExtraData" inherit="BSExtraData" versions="V20_2_0_7_FO4">
+    <niobject name="BSClothExtraData" inherit="BSExtraData" versions="#FO4#">
         Fallout 4 Cloth data
         <add name="Binary Data" type="ByteArray" />
     </niobject>
     
     <!-- Fallout 4 Skeleton -->
 
-    <compound name="BSSkinBoneTrans" versions="V20_2_0_7_FO4">
+    <compound name="BSSkinBoneTrans" versions="#FO4#">
         Fallout 4 Bone Transform
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Rotation" type="Matrix33" />
@@ -7551,7 +7551,7 @@
         <add name="Scale" type="float" />
     </compound>
 
-    <niobject name="BSSkin::Instance" inherit="NiObject" versions="V20_2_0_7_FO4">
+    <niobject name="BSSkin::Instance" inherit="NiObject" versions="#FO4#">
         Fallout 4 Skin Instance
         <add name="Skeleton Root" type="Ptr" template="NiAVObject" />
         <add name="Data" type="Ref" template="BSSkin::BoneData" />
@@ -7561,19 +7561,19 @@
         <add name="Unknown" type="Vector3" arr1="Num Unknown" />
     </niobject>
 
-    <niobject name="BSSkin::BoneData" inherit="NiObject" versions="V20_2_0_7_FO4">
+    <niobject name="BSSkin::BoneData" inherit="NiObject" versions="#FO4#">
         Fallout 4 Bone Data
         <add name="Num Bones" type="uint" />
         <add name="Bone List" type="BSSkinBoneTrans" arr1="Num Bones" />
     </niobject>
 
-    <niobject name="BSPositionData" inherit="NiExtraData" versions="V20_2_0_7_FO4">
+    <niobject name="BSPositionData" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Positional Data
         <add name="Num Data" type="uint" />
         <add name="Data" type="hfloat" arr1="Num Data" />
     </niobject>
 
-    <compound name="BSConnectPoint" versions="V20_2_0_7_FO4">
+    <compound name="BSConnectPoint" versions="#FO4#">
         <add name="Parent" type="SizedString" default="WorkshopConnectPoints" />
         <add name="Name" type="SizedString" />
         <add name="Rotation" type="Quaternion" />
@@ -7581,32 +7581,32 @@
         <add name="Scale" type="float" default="1.0" />
     </compound>
 
-    <niobject name="BSConnectPoint::Parents" inherit="NiExtraData" versions="V20_2_0_7_FO4">
+    <niobject name="BSConnectPoint::Parents" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Item Slot Parent
         <add name="Num Connect Points" type="uint" />
         <add name="Connect Points" type="BSConnectPoint" arr1="Num Connect Points" />
     </niobject>
 
-    <niobject name="BSConnectPoint::Children" inherit="NiExtraData" versions="V20_2_0_7_FO4">
+    <niobject name="BSConnectPoint::Children" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Item Slot Child
         <add name="Skinned" type="bool" />
         <add name="Num Points" type="int" />
         <add name="Point Name" type="SizedString" arr1="Num Points" />
     </niobject>
     
-    <niobject name="BSEyeCenterExtraData" inherit="NiExtraData" versions="V20_2_0_7_FO4">
+    <niobject name="BSEyeCenterExtraData" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Eye Center Data
         <add name="Num Data" type="int" />
         <add name="Data" type="float" arr1="Num Data" />
     </niobject>
 	
-    <compound name="BSPackedGeomDataCombined" versions="V20_2_0_7_FO4">
+    <compound name="BSPackedGeomDataCombined" versions="#FO4#">
         <add name="Grayscale to Palette Scale" type="float" />
         <add name="Transform" type="NiTransform" />
         <add name="Bounding Sphere" type="NiBound" />
     </compound>
 
-    <compound name="BSPackedGeomData" versions="V20_2_0_7_FO4">
+    <compound name="BSPackedGeomData" versions="#FO4#">
         <add name="Num Verts" type="uint" />
         <add name="LOD Levels" type="uint" />
         <add name="Tri Count LOD0" type="uint" />
@@ -7622,7 +7622,7 @@
         <add name="Triangles" type="Triangle" arr1="Tri Count LOD0 + Tri Count LOD1 + Tri Count LOD2" />
     </compound>
 
-    <compound name="BSPackedSharedGeomData" versions="V20_2_0_7_FO4">
+    <compound name="BSPackedSharedGeomData" versions="#FO4#">
         <add name="Num Verts" type="uint" />
         <add name="LOD Levels" type="uint" />
         <add name="Tri Count LOD0" type="uint" />
@@ -7636,13 +7636,13 @@
         <add name="Vertex Desc" type="BSVertexDesc" />
     </compound>
 
-    <compound name="BSPackedGeomObject" versions="V20_2_0_7_FO4">
+    <compound name="BSPackedGeomObject" versions="#FO4#">
         This appears to be a 64-bit hash but nif.xml does not have a 64-bit type.
         <add name="Shape ID 1" type="uint" />
         <add name="Shape ID 2" type="uint" />
     </compound>
 
-    <niobject name="BSPackedCombinedGeomDataExtra" inherit="NiExtraData" versions="V20_2_0_7_FO4">
+    <niobject name="BSPackedCombinedGeomDataExtra" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Packed Combined Geometry Data.
         Geometry is baked into the file and given a list of transforms to position each copy.
         <add name="Vertex Desc" type="BSVertexDesc" />
@@ -7654,7 +7654,7 @@
         <add name="Object Data" type="BSPackedGeomData" arr1="Num Data" />
     </niobject>
 
-    <niobject name="BSPackedCombinedSharedGeomDataExtra" inherit="NiExtraData" versions="V20_2_0_7_FO4">
+    <niobject name="BSPackedCombinedSharedGeomDataExtra" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Packed Combined Shared Geometry Data.
         Geometry is NOT baked into the file. It is instead a reference to the shape via a Shape ID (currently undecoded)
         which loads the geometry via the STAT form for the NIF.
@@ -7670,18 +7670,18 @@
 
     <!-- Fallout 4 Animation -->
     
-    <niobject name="NiLightRadiusController" inherit="NiFloatInterpController" versions="V20_2_0_7_FO4">
+    <niobject name="NiLightRadiusController" inherit="NiFloatInterpController" versions="#FO4#">
     
     </niobject>
 	
 	<!-- Skyrim SE --> 
 
-	<niobject name="BSDynamicTriShape" inherit="BSTriShape" versions="V20_2_0_7_SSE">
+	<niobject name="BSDynamicTriShape" inherit="BSTriShape" versions="#SSE#">
 		<add name="Dynamic Data Size" type="uint" />
 		<add name="Vertices" type="Vector4" arr1="Dynamic Data Size / 16" />
 	</niobject>
 	
-	<niobject name="BSDistantObjectLargeRefExtraData" inherit="NiExtraData" versions="V20_2_0_7_SSE">
+	<niobject name="BSDistantObjectLargeRefExtraData" inherit="NiExtraData" versions="#SSE#">
         Large ref flag.
 		<add name="Large Ref" type="bool" />
 	</niobject>

From 30010df6041d5817607afe6466eb90876b581b1d Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 5 Jun 2018 04:18:55 -0400
Subject: [PATCH 30/86] Use tokens for defaults

For #70
---
 nif.xml | 148 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/nif.xml b/nif.xml
index 508e836..878c5fa 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1687,7 +1687,7 @@
         <!-- NiTextureTransform -->
         <add name="Has Texture Transform" type="bool" default="false" ver1="10.1.0.0">Whether or not the texture coordinates are transformed.</add>
         <add name="Translation" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0">The UV translation.</add>
-        <add name="Scale" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0" default="1.0, 1.0">The UV scale.</add>
+        <add name="Scale" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0" default="#VEC2_ONE#">The UV scale.</add>
         <add name="Rotation" type="float" default="0.0" cond="Has Texture Transform" ver1="10.1.0.0">The W axis rotation in texture space.</add>
         <add name="Transform Method" type="TransformMethod" cond="Has Texture Transform" ver1="10.1.0.0">Depending on the source, scaling can occur before or after rotation.</add>
         <add name="Center" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0">The origin around which the texture rotates.</add>
@@ -2666,9 +2666,9 @@
         <add name="Unused 1" type="uint">Looks like a memory pointer and may be garbage.</add>
         <add name="Radius" type="float" default="0.1" />
         <add name="Unused 2" type="uint">Looks like a memory pointer and may be garbage.</add>
-        <add name="Scale" type="Vector4" default="1.0, 1.0, 1.0, 0.0" />
+        <add name="Scale" type="Vector4" default="#VEC4_1110#" />
         <add name="Radius Copy" type="float" default="0.1">Same as radius</add>
-        <add name="Scale Copy" type="Vector4" default="1.0, 1.0, 1.0, 0.0">Same as scale.</add>
+        <add name="Scale Copy" type="Vector4" default="#VEC4_1110#">Same as scale.</add>
         <add name="Data" type="Ref" template="hkPackedNiTriStripsData" />
     </niobject>
 
@@ -2678,7 +2678,7 @@
         <add name="Radius" type="float" default="0.1" />
         <add name="Unused" type="uint" arr1="5">Garbage data from memory though the last 3 are referred to as maxSize, size, and eSize.</add>
         <add name="Grow By" type="uint" default="1" />
-        <add name="Scale" type="Vector4" default="1.0, 1.0, 1.0, 0.0" ver1="10.1.0.0">Scale. Usually (1.0, 1.0, 1.0, 0.0).</add>
+        <add name="Scale" type="Vector4" default="#VEC4_1110#" ver1="10.1.0.0">Scale. Usually (1.0, 1.0, 1.0, 0.0).</add>
         <add name="Num Strips Data" type="uint">The number of strips data objects referenced.</add>
         <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data">Refers to a bunch of NiTriStripsData objects that make up this shape.</add>
         <add name="Num Data Layers" type="uint">Number of Havok Layers, equal to Number of strips data objects.</add>
@@ -2703,13 +2703,13 @@
 
     <niobject name="NiColorInterpolator" inherit="NiKeyBasedInterpolator">
         Animates a color value over time.
-        <add name="Value" type="Color4" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
+        <add name="Value" type="Color4" default="#INV_VEC4#" />
         <add name="Data" type="Ref" template="NiColorData" />
     </niobject>
 
     <niobject name="NiFloatInterpolator" inherit="NiKeyBasedInterpolator">
         Uses NiFloatKeys to animate a float value over time.
-        <add name="Value" type="float" default="-3.402823466e+38">Pose value if lacking NiFloatData.</add>
+        <add name="Value" type="float" default="#INV_FLT#">Pose value if lacking NiFloatData.</add>
         <add name="Data" type="Ref" template="NiFloatData" />
     </niobject>
 
@@ -2721,7 +2721,7 @@
 
     <niobject name="NiPoint3Interpolator" inherit="NiKeyBasedInterpolator">
         Uses NiPosKeys to animate an NiPoint3 value over time.
-        <add name="Value" type="Vector3" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38">Pose value if lacking NiPosData.</add>
+        <add name="Value" type="Vector3" default="#INV_VEC3#">Pose value if lacking NiPosData.</add>
         <add name="Data" type="Ref" template="NiPosData" />
     </niobject>
 
@@ -2783,10 +2783,10 @@
         <add name="Single Index" type="byte" default="255" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
         <add name="High Priority" type="char" default="-128" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
         <add name="Next High Priority" type="char" default="-128" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="Single Time" type="float" default="-3.402823466e+38" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="High Weights Sum" type="float" default="-3.402823466e+38" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="Next High Weights Sum" type="float" default="-3.402823466e+38" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="High Ease Spinner" type="float" default="-3.402823466e+38" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
+        <add name="Single Time" type="float" default="#FLT_MIN#" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
+        <add name="High Weights Sum" type="float" default="#FLT_MIN#" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
+        <add name="Next High Weights Sum" type="float" default="#FLT_MIN#" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
+        <add name="High Ease Spinner" type="float" default="#FLT_MIN#" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
         <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
         <!-- end Flags 1 conds -->
         <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" ver2="10.1.0.111" />
@@ -2807,8 +2807,8 @@
 
     <niobject name="NiBSplineInterpolator" abstract="1" inherit="NiInterpolator">
         Abstract base class for interpolators storing data via a B-spline.
-        <add name="Start Time" type="float" default="3.402823466e+38">Animation start time.</add>
-        <add name="Stop Time" type="float" default="-3.402823466e+38">Animation stop time.</add>
+        <add name="Start Time" type="float" default="#FLT_MAX#">Animation start time.</add>
+        <add name="Stop Time" type="float" default="#FLT_MIN#">Animation stop time.</add>
         <add name="Spline Data" type="Ref" template="NiBSplineData" />
         <add name="Basis Data" type="Ref" template="NiBSplineBasisData" />
     </niobject>
@@ -2924,9 +2924,9 @@
         Abstract base class that represents light sources in a scene graph.
         For Bethesda Stream 130 (FO4), NiLight now directly inherits from NiAVObject.
         <add name="Dimmer" type="float" default="1.0">Scales the overall brightness of all light components.</add>
-        <add name="Ambient Color" type="Color3" default="0.0, 0.0, 0.0" />
-        <add name="Diffuse Color" type="Color3" default="0.0, 0.0, 0.0" />
-        <add name="Specular Color" type="Color3" default="0.0, 0.0, 0.0" />
+        <add name="Ambient Color" type="Color3" default="#VEC3_ZERO#" />
+        <add name="Diffuse Color" type="Color3" default="#VEC3_ZERO#" />
+        <add name="Specular Color" type="Color3" default="#VEC3_ZERO#" />
     </niobject>
 
     <niobject name="NiProperty" abstract="1" inherit="NiObjectNET">
@@ -2981,8 +2981,8 @@
         </add>
         <add name="Frequency" type="float" default="1.0">Frequency (is usually 1.0).</add>
         <add name="Phase" type="float">Phase (usually 0.0).</add>
-        <add name="Start Time" type="float" default="3.402823466e+38">Controller start time.</add>
-        <add name="Stop Time" type="float" default="-3.402823466e+38">Controller stop time.</add>
+        <add name="Start Time" type="float" default="#FLT_MAX#">Controller start time.</add>
+        <add name="Stop Time" type="float" default="#FLT_MIN#">Controller stop time.</add>
         <add name="Target" type="Ptr" template="NiObjectNET" ver1="3.3.0.13">Controller target (object index of the first controllable ancestor of this object).</add>
         <add name="Unknown Integer" type="uint" ver2="3.1" />
     </niobject>
@@ -3528,12 +3528,12 @@
 
     <niobject name="NiBlendFloatInterpolator" inherit="NiBlendInterpolator">
         Blends float values together.
-        <add name="Value" type="float" default="-3.402823466e+38">The pose value. Invalid if using data.</add>
+        <add name="Value" type="float" default="#INV_FLT#">The pose value. Invalid if using data.</add>
     </niobject>
 
     <niobject name="NiBlendPoint3Interpolator" inherit="NiBlendInterpolator">
         Blends NiPoint3 values together.
-        <add name="Value" type="Vector3" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38">The pose value. Invalid if using data.</add>
+        <add name="Value" type="Vector3" default="#INV_VEC3#">The pose value. Invalid if using data.</add>
     </niobject>
 
     <niobject name="NiBlendTransformInterpolator" inherit="NiBlendInterpolator">
@@ -3558,26 +3558,26 @@
 
     <niobject name="NiBSplineFloatInterpolator" abstract="1" inherit="NiBSplineInterpolator">
         Uses B-Splines to animate a float value over time.
-        <add name="Value" type="float" default="-3.402823466e+38">Base value when curve not defined.</add>
+        <add name="Value" type="float" default="#INV_FLT#">Base value when curve not defined.</add>
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
     <niobject name="NiBSplineCompFloatInterpolator" inherit="NiBSplineFloatInterpolator">
         NiBSplineFloatInterpolator plus the information required for using compact control points.
-        <add name="Float Offset" type="float" default="3.402823466e+38" />
-        <add name="Float Half Range" type="float" default="3.402823466e+38" />
+        <add name="Float Offset" type="float" default="#FLT_MAX#" />
+        <add name="Float Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiBSplinePoint3Interpolator" abstract="1" inherit="NiBSplineInterpolator">
         Uses B-Splines to animate an NiPoint3 value over time.
-        <add name="Value" type="Vector3" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38">Base value when curve not defined.</add>
+        <add name="Value" type="Vector3" default="#INV_VEC3#">Base value when curve not defined.</add>
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
     <niobject name="NiBSplineCompPoint3Interpolator" inherit="NiBSplinePoint3Interpolator">
         NiBSplinePoint3Interpolator plus the information required for using compact control points.
-        <add name="Position Offset" type="float" default="3.402823466e+38" />
-        <add name="Position Half Range" type="float" default="3.402823466e+38" />
+        <add name="Position Offset" type="float" default="#FLT_MAX#" />
+        <add name="Position Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiBSplineTransformInterpolator" inherit="NiBSplineInterpolator">
@@ -3591,12 +3591,12 @@
 
     <niobject name="NiBSplineCompTransformInterpolator" inherit="NiBSplineTransformInterpolator">
         NiBSplineTransformInterpolator plus the information required for using compact control points.
-        <add name="Translation Offset" type="float" default="3.402823466e+38" />
-        <add name="Translation Half Range" type="float" default="3.402823466e+38" />
-        <add name="Rotation Offset" type="float" default="3.402823466e+38" />
-        <add name="Rotation Half Range" type="float" default="3.402823466e+38" />
-        <add name="Scale Offset" type="float" default="3.402823466e+38" />
-        <add name="Scale Half Range" type="float" default="3.402823466e+38" />
+        <add name="Translation Offset" type="float" default="#FLT_MAX#" />
+        <add name="Translation Half Range" type="float" default="#FLT_MAX#" />
+        <add name="Rotation Offset" type="float" default="#FLT_MAX#" />
+        <add name="Rotation Half Range" type="float" default="#FLT_MAX#" />
+        <add name="Scale Offset" type="float" default="#FLT_MAX#" />
+        <add name="Scale Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 	
 	<niobject name="BSRotAccumTransfInterpolator" inherit="NiTransformInterpolator" versions="#BETHESDA#">
@@ -3669,8 +3669,8 @@
         <add name="Cycle Type" type="CycleType" ver1="10.1.0.106" />
         <add name="Frequency" type="float" default="1.0" ver1="10.1.0.106" />
         <add name="Phase" type="float" ver1="10.1.0.106" ver2="10.4.0.1" /> <!-- Actually ver2="10.3.0.1" but WorldShift 10.4.0.1 custom version acts like 10.3.0.1 -->
-        <add name="Start Time" type="float" default="3.402823466e+38" ver1="10.1.0.106" />
-        <add name="Stop Time" type="float" default="-3.402823466e+38" ver1="10.1.0.106" />
+        <add name="Start Time" type="float" default="#FLT_MAX#" ver1="10.1.0.106" />
+        <add name="Stop Time" type="float" default="#FLT_MIN#" ver1="10.1.0.106" />
         <add name="Play Backwards" type="bool" ver1="10.1.0.106" ver2="10.1.0.106" />
         <add name="Manager" type="Ptr" template="NiControllerManager" ver1="10.1.0.106">The owner of this sequence.</add>
         <add name="Accum Root Name" type="string" ver1="10.1.0.106">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
@@ -3818,10 +3818,10 @@
     <niobject name="NiMaterialProperty" inherit="NiProperty">
         Describes the surface properties of an object e.g. translucency, ambient color, diffuse color, emissive color, and specular color.
         <add name="Flags" type="Flags" ver1="3.0" ver2="10.0.1.2">Property flags.</add>
-        <add name="Ambient Color" type="Color3" default="1.0, 1.0, 1.0" vercond="(User Version 2 &lt; 26)">How much the material reflects ambient light.</add>
-        <add name="Diffuse Color" type="Color3" default="1.0, 1.0, 1.0" vercond="(User Version 2 &lt; 26)">How much the material reflects diffuse light.</add>
-        <add name="Specular Color" type="Color3" default="1.0, 1.0, 1.0">How much light the material reflects in a specular manner.</add>
-        <add name="Emissive Color" type="Color3" default="0.0, 0.0, 0.0">How much light the material emits.</add>
+        <add name="Ambient Color" type="Color3" default="#VEC3_ONE#" vercond="(User Version 2 &lt; 26)">How much the material reflects ambient light.</add>
+        <add name="Diffuse Color" type="Color3" default="#VEC3_ONE#" vercond="(User Version 2 &lt; 26)">How much the material reflects diffuse light.</add>
+        <add name="Specular Color" type="Color3" default="#VEC3_ONE#">How much light the material reflects in a specular manner.</add>
+        <add name="Emissive Color" type="Color3" default="#VEC3_ZERO#">How much light the material emits.</add>
         <add name="Glossiness" type="float" default="10.0">The material glossiness.</add>
         <add name="Alpha" type="float" default="1.0">The material transparency (1=non-transparant). Refer to a NiAlphaProperty object in this material's parent NiTriShape object, when alpha is not 1.</add>
         <add name="Emissive Mult" type="float" default="1.0" vercond="(User Version 2 &gt; 21)" />
@@ -4225,10 +4225,10 @@
     <niobject name="NiPSysDragModifier" inherit="NiPSysModifier">
         Particle modifier that applies a linear drag force to particles.
         <add name="Drag Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the force.</add>
-        <add name="Drag Axis" type="Vector3" default="1.0, 0.0, 0.0">The local direction of the force.</add>
+        <add name="Drag Axis" type="Vector3" default="#X_AXIS#">The local direction of the force.</add>
         <add name="Percentage" type="float" default="0.05">The amount of drag to apply to particles.</add>
-        <add name="Range" type="float" default="3.402823466e+38">The distance up to which particles are fully affected.</add>
-        <add name="Range Falloff" type="float" default="3.402823466e+38">The distance at which particles cease to be affected.</add>
+        <add name="Range" type="float" default="#FLT_MAX#">The distance up to which particles are fully affected.</add>
+        <add name="Range Falloff" type="float" default="#FLT_MAX#">The distance at which particles cease to be affected.</add>
     </niobject>
 
     <niobject name="NiPSysEmitterCtlrData" inherit="NiObject">
@@ -4241,7 +4241,7 @@
     <niobject name="NiPSysGravityModifier" inherit="NiPSysModifier">
         Particle modifier that applies a gravitational force to particles.
         <add name="Gravity Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the force.</add>
-        <add name="Gravity Axis" type="Vector3" default="1.0, 0.0, 0.0">The local direction of the force.</add>
+        <add name="Gravity Axis" type="Vector3" default="#X_AXIS#">The local direction of the force.</add>
         <add name="Decay" type="float">How the force diminishes by distance.</add>
         <add name="Strength" type="float" default="1.0">The acceleration of the force.</add>
         <add name="Force Type" type="ForceType">The type of gravitational force.</add>
@@ -4265,7 +4265,7 @@
         <add name="Emitter Meshes" type="Ptr" template="NiAVObject" arr1="Num Emitter Meshes">The meshes which are emitted from.</add>
         <add name="Initial Velocity Type" type="VelocityType">The method by which the initial particle velocity will be computed.</add>
         <add name="Emission Type" type="EmitFrom">The manner in which particles are emitted from the Emitter Meshes.</add>
-        <add name="Emission Axis" type="Vector3" default="1.0, 0.0, 0.0">The emission axis if VELOCITY_USE_DIRECTION.</add>
+        <add name="Emission Axis" type="Vector3" default="#X_AXIS#">The emission axis if VELOCITY_USE_DIRECTION.</add>
     </niobject>
 
     <niobject name="NiPSysMeshUpdateModifier" inherit="NiPSysModifier">
@@ -4331,7 +4331,7 @@
         <add name="Rotation Angle Variation" type="float" ver1="20.0.0.2">Distributes rotation angle over the range [Angle - Variation, Angle + Variation].</add>
         <add name="Random Rot Speed Sign" type="bool" ver1="20.0.0.2">Randomly negate the initial rotation speed?</add>
         <add name="Random Axis" type="bool" default="1">Assign a random axis to new particles?</add>
-        <add name="Axis" type="Vector3" default="1.0, 0.0, 0.0">Initial rotation axis.</add>
+        <add name="Axis" type="Vector3" default="#X_AXIS#">Initial rotation axis.</add>
     </niobject>
 
     <niobject name="NiPSysSpawnModifier" inherit="NiPSysModifier">
@@ -4379,7 +4379,7 @@
 
     <niobject name="NiPSysGravityFieldModifier" inherit="NiPSysFieldModifier">
         Particle system modifier, implements a gravity field force for particles.
-        <add name="Direction" type="Vector3" default="0.0, -1.0, 0.0">Direction of the gravity field in Field Object's space.</add>
+        <add name="Direction" type="Vector3" default="#NEG_Y_AXIS#">Direction of the gravity field in Field Object's space.</add>
     </niobject>
 
     <niobject name="NiPSysDragFieldModifier" inherit="NiPSysFieldModifier">
@@ -4456,7 +4456,7 @@
 
     <niobject name="NiPSysAirFieldModifier" inherit="NiPSysFieldModifier">
         Particle system modifier, updates the particle velocity to simulate the effects of air movements like wind, fans, or wake.
-        <add name="Direction" type="Vector3" default="-1.0, 0.0, 0.0">Direction of the particle velocity</add>
+        <add name="Direction" type="Vector3" default="#NEG_X_AXIS#">Direction of the particle velocity</add>
         <add name="Air Friction" type="float">How quickly particles will accelerate to the magnitude of the air field.</add>
         <add name="Inherit Velocity" type="float">How much of the air field velocity will be added to the particle velocity.</add>
         <add name="Inherit Rotation" type="bool" />
@@ -4615,7 +4615,7 @@
         <add name="Stencil Enabled" type="byte" ver2="20.0.0.5">Enables or disables the stencil test.</add>
         <add name="Stencil Function" type="StencilCompareMode" ver2="20.0.0.5">Selects the compare mode function (see: glStencilFunc).</add>
         <add name="Stencil Ref" type="uint" ver2="20.0.0.5" />
-        <add name="Stencil Mask" type="uint" default="4294967295" ver2="20.0.0.5">A bit mask. The default is 0xffffffff.</add>
+        <add name="Stencil Mask" type="uint" default="#UINT_MAX#" ver2="20.0.0.5">A bit mask. The default is 0xffffffff.</add>
         <add name="Fail Action" type="StencilAction" ver2="20.0.0.5" />
         <add name="Z Fail Action" type="StencilAction" ver2="20.0.0.5" />
         <add name="Pass Action" type="StencilAction" ver2="20.0.0.5" />
@@ -4630,7 +4630,7 @@
             Bits 12-14: Stencil Function
         </add>
         <add name="Stencil Ref" type="uint" ver1="20.1.0.3" />
-        <add name="Stencil Mask" type="uint" default="4294967295" ver1="20.1.0.3">A bit mask. The default is 0xffffffff.</add>
+        <add name="Stencil Mask" type="uint" default="#UINT_MAX#" ver1="20.1.0.3">A bit mask. The default is 0xffffffff.</add>
     </niobject>
 
     <niobject name="NiStringExtraData" inherit="NiExtraData">
@@ -5856,9 +5856,9 @@
         <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" vercond="(User Version 2 == 130)" default="2151678465">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
         <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" vercond="(User Version 2 == 130)" default="1">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
         <add name="UV Offset" type="TexCoord">Offset UVs</add>
-        <add name="UV Scale" type="TexCoord" default="1.0, 1.0">Offset UV Scale to repeat tiling textures, see above.</add>
+        <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set, can have override in an esm/esp</add>
-        <add name="Emissive Color" type="Color3" default="0.0, 0.0, 0.0">Glow color and alpha</add>
+        <add name="Emissive Color" type="Color3" default="#VEC3_ZERO#">Glow color and alpha</add>
         <add name="Emissive Multiple" type="float">Multiplied emissive colors</add>
         <add name="Wet Material" type="string" vercond="(User Version 2 == 130)" />
         <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T">How to handle texture borders.</add>
@@ -5905,7 +5905,7 @@
         <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" default="2147483648" vercond="(User Version 2 == 130)" />
         <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" default="32" vercond="(User Version 2 == 130)" />
         <add name="UV Offset" type="TexCoord">Offset UVs</add>
-        <add name="UV Scale" type="TexCoord" default="1.0, 1.0">Offset UV Scale to repeat tiling textures</add>
+        <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures</add>
         <add name="Source Texture"  type="SizedString">points to an external texture.</add>
         <!-- TODO: Requires bitfield, read as single int -->
         <add name="Texture Clamp Mode" type="byte">How to handle texture borders.</add>
@@ -5944,7 +5944,7 @@
         <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1"></add>
         <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2"></add>
         <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
-        <add name="UV Scale" type="TexCoord" default="1.0, 1.0">Offset UV Scale to repeat tiling textures, see above.</add>
+        <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Water Shader Flags" type="SkyrimWaterShaderFlags">Defines attributes for the water shader (will use SkyrimWaterShaderFlags)</add>
         <add name="Water Direction" type="byte" default="3">A bitflag, only the first/second bit controls water flow positive or negative along UVs.</add>
         <add name="Unknown Short 3" type="ushort" /> 
@@ -5955,7 +5955,7 @@
         <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1"></add>
         <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2"></add>
         <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
-        <add name="UV Scale" type="TexCoord" default="1.0, 1.0">Offset UV Scale to repeat tiling textures, see above.</add>
+        <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Source Texture" type="SizedString">points to an external texture.</add>
         <add name="Sky Object Type" type="SkyObjectType" />
     </niobject>
@@ -7199,23 +7199,23 @@
     </niobject>
 
     <niobject name="NiConstBoolEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
-        <add name="Value" type="float" default="-3.402823466e+38" /> <!-- Yes, this is actually a float. -->
+        <add name="Value" type="float" default="#INV_FLT#" /> <!-- Yes, this is actually a float. -->
     </niobject>
 
     <niobject name="NiConstColorEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
-        <add name="Value" type="Color4" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
+        <add name="Value" type="Color4" default="#INV_VEC4#" />
     </niobject>
 
     <niobject name="NiConstFloatEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
-        <add name="Value" type="float" default="-3.402823466e+38" />
+        <add name="Value" type="float" default="#INV_FLT#" />
     </niobject>
 
     <niobject name="NiConstPoint3Evaluator" inherit="NiEvaluator" since="V20_5_0_0">
-        <add name="Value" type="Vector3" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
+        <add name="Value" type="Vector3" default="#INV_VEC3#" />
     </niobject>
 
     <niobject name="NiConstQuaternionEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
-        <add name="Value" type="Quaternion" default="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
+        <add name="Value" type="Quaternion" default="#INV_VEC4#" />
     </niobject>
 
     <niobject name="NiConstTransformEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
@@ -7223,8 +7223,8 @@
     </niobject>
 
     <niobject name="NiBSplineEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
-        <add name="Start Time" type="float" default="3.402823466e+38" />
-        <add name="End Time" type="float" default="-3.402823466e+38" />
+        <add name="Start Time" type="float" default="#FLT_MAX#" />
+        <add name="End Time" type="float" default="#FLT_MIN#" />
         <add name="Data" type="Ref" template="NiBSplineData" />
         <add name="Basis Data" type="Ref" template="NiBSplineBasisData" />
     </niobject>
@@ -7234,8 +7234,8 @@
     </niobject>
 
     <niobject name="NiBSplineCompColorEvaluator" inherit="NiBSplineColorEvaluator" since="V20_5_0_0">
-        <add name="Offset" type="float" default="3.402823466e+38" />
-        <add name="Half Range" type="float" default="3.402823466e+38" />
+        <add name="Offset" type="float" default="#FLT_MAX#" />
+        <add name="Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiBSplineFloatEvaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
@@ -7243,8 +7243,8 @@
     </niobject>
 
     <niobject name="NiBSplineCompFloatEvaluator" inherit="NiBSplineFloatEvaluator" since="V20_5_0_0">
-        <add name="Offset" type="float" default="3.402823466e+38" />
-        <add name="Half Range" type="float" default="3.402823466e+38" />
+        <add name="Offset" type="float" default="#FLT_MAX#" />
+        <add name="Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiBSplinePoint3Evaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
@@ -7252,8 +7252,8 @@
     </niobject>
 
     <niobject name="NiBSplineCompPoint3Evaluator" inherit="NiBSplinePoint3Evaluator" since="V20_5_0_0">
-        <add name="Offset" type="float" default="3.402823466e+38" />
-        <add name="Half Range" type="float" default="3.402823466e+38" />
+        <add name="Offset" type="float" default="#FLT_MAX#" />
+        <add name="Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiBSplineTransformEvaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
@@ -7264,12 +7264,12 @@
     </niobject>
 
     <niobject name="NiBSplineCompTransformEvaluator" inherit="NiBSplineTransformEvaluator" since="V20_5_0_0">
-        <add name="Translation Offset" type="float" default="3.402823466e+38" />
-        <add name="Translation Half Range" type="float" default="3.402823466e+38" />
-        <add name="Rotation Offset" type="float" default="3.402823466e+38" />
-        <add name="Rotation Half Range" type="float" default="3.402823466e+38" />
-        <add name="Scale Offset" type="float" default="3.402823466e+38" />
-        <add name="Scale Half Range" type="float" default="3.402823466e+38" />
+        <add name="Translation Offset" type="float" default="#FLT_MAX#" />
+        <add name="Translation Half Range" type="float" default="#FLT_MAX#" />
+        <add name="Rotation Offset" type="float" default="#FLT_MAX#" />
+        <add name="Rotation Half Range" type="float" default="#FLT_MAX#" />
+        <add name="Scale Offset" type="float" default="#FLT_MAX#" />
+        <add name="Scale Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiLookAtEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
@@ -7354,9 +7354,9 @@
         <add name="User Data" type="uint" />
         <add name="Radius" type="float" default="0.005">A shell that is added around the shape.</add>
         <add name="Unknown Float 1" type="float" />
-        <add name="Scale" type="Vector4" default="1.0, 1.0, 1.0, 0.0">Scale</add>
+        <add name="Scale" type="Vector4" default="#VEC4_1110#">Scale</add>
         <add name="Radius Copy" type="float" default="0.005">A shell that is added around the shape.</add>
-        <add name="Scale Copy" type="Vector4" default="1.0, 1.0, 1.0, 0.0">Scale</add>
+        <add name="Scale Copy" type="Vector4" default="#VEC4_1110#">Scale</add>
         <add name="Data" type="Ref" template="bhkCompressedMeshShapeData">The collision mesh data.</add>
     </niobject>
 

From d88663133a09518c6ee294ff9a648373336fdfd7 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 5 Jun 2018 04:21:15 -0400
Subject: [PATCH 31/86] Use tokens for verconds

For #70
---
 nif.xml | 368 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 184 insertions(+), 184 deletions(-)

diff --git a/nif.xml b/nif.xml
index 878c5fa..885eec7 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1559,7 +1559,7 @@
         <add name="Blend Interpolator" type="Ref" template="NiBlendInterpolator" ver1="10.1.0.104" ver2="10.1.0.110" />
         <add name="Blend Index" type="ushort" ver1="10.1.0.104" ver2="10.1.0.110" />
         <!-- Bethesda-only -->
-        <add name="Priority" type="byte" ver1="10.1.0.106" vercond="(User Version 2 &gt; 0)">Idle animations tend to have low values for this, and high values tend to correspond with the important parts of the animations.</add>
+        <add name="Priority" type="byte" ver1="10.1.0.106" vercond="#BSSTREAM#">Idle animations tend to have low values for this, and high values tend to correspond with the important parts of the animations.</add>
         <!-- NiControllerSequence::IDTag, post-10.1.0.104 only -->
         <!-- Until 10.2 -->
         <add name="Node Name" type="string" ver1="10.1.0.104" ver2="10.1.0.113">The name of the animated NiAVObject.</add>
@@ -1790,9 +1790,9 @@
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="(Has Faces) &amp;&amp; (Num Strips == 0)" ver1="10.1.0.0">The triangles.</add>
         <add name="Has Bone Indices" type="bool">Do we have bone indices?</add>
         <add name="Bone Indices" type="byte" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Bone Indices">Bone indices, they index into 'Bones'.</add>
-		<add name="Unknown Short" type="ushort" vercond="User Version 2 &gt; 34" />
-		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
-		<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
+		<add name="Unknown Short" type="ushort" vercond="#BS_GT_FO3#" />
+		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
     </compound>
 
     <compound name="NiPlane">
@@ -1805,7 +1805,7 @@
         A sphere.
         <add name="Center" type="Vector3">The sphere's center.</add>
         <add name="Radius" type="float">The sphere's radius.</add>
-        <add name="DIV2 13 Shorts" type="short" arr1="13" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
+        <add name="DIV2 13 Shorts" type="short" arr1="13" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
     </compound>
 
     <compound name="NiCurve3">
@@ -1849,12 +1849,12 @@
     <compound name="FurniturePosition" versions="#BETHESDA#">
         Bethesda Animation. Describes a furniture position?
         <add name="Offset" type="Vector3">Offset of furniture marker.</add>
-        <add name="Orientation" type="ushort" vercond="User Version 2 &lt;= 34">Furniture marker orientation.</add>
-        <add name="Position Ref 1" type="byte" vercond="User Version 2 &lt;= 34">Refers to a furnituremarkerxx.nif file. Always seems to be the same as Position Ref 2.</add>
-        <add name="Position Ref 2" type="byte" vercond="User Version 2 &lt;= 34">Refers to a furnituremarkerxx.nif file. Always seems to be the same as Position Ref 1.</add>
-        <add name="Heading" type="float" vercond="User Version 2 &gt; 34">Similar to Orientation, in float form.</add>
-        <add name="Animation Type" type="AnimationType" vercond="User Version 2 &gt; 34" />
-        <add name="Entry Properties" type="FurnitureEntryPoints" vercond="User Version 2 &gt; 34" />
+        <add name="Orientation" type="ushort" vercond="#NI_BS_LTE_FO3#">Furniture marker orientation.</add>
+        <add name="Position Ref 1" type="byte" vercond="#NI_BS_LTE_FO3#">Refers to a furnituremarkerxx.nif file. Always seems to be the same as Position Ref 2.</add>
+        <add name="Position Ref 2" type="byte" vercond="#NI_BS_LTE_FO3#">Refers to a furnituremarkerxx.nif file. Always seems to be the same as Position Ref 1.</add>
+        <add name="Heading" type="float" vercond="#BS_GT_FO3#">Similar to Orientation, in float form.</add>
+        <add name="Animation Type" type="AnimationType" vercond="#BS_GT_FO3#" />
+        <add name="Entry Properties" type="FurnitureEntryPoints" vercond="#BS_GT_FO3#" />
     </compound>
 
     <compound name="TriangleData" versions="#BETHESDA#">
@@ -1897,8 +1897,8 @@
     <compound name="HavokFilter" versions="#BETHESDA#">
         Bethesda Havok. Collision filter info representing Layer, Flags, Part Number, and Group all combined into one uint.
         <add name="Layer" suffix="OB" type="OblivionLayer" default="OL_STATIC" ver2="20.0.0.5" vercond="(User Version 2 &lt; 16)">The layer the collision belongs to.</add>
-        <add name="Layer" suffix="FO" type="Fallout3Layer" default="FOL_STATIC" vercond="(Version == 20.2.0.7) &amp;&amp; (User Version 2 &lt;= 34)">The layer the collision belongs to.</add>
-        <add name="Layer" suffix="SK" type="SkyrimLayer" default="SKYL_STATIC" vercond="(Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 34)">The layer the collision belongs to.</add>
+        <add name="Layer" suffix="FO" type="Fallout3Layer" default="FOL_STATIC" vercond="(Version == 20.2.0.7) &amp;&amp; #NI_BS_LTE_FO3#">The layer the collision belongs to.</add>
+        <add name="Layer" suffix="SK" type="SkyrimLayer" default="SKYL_STATIC" vercond="(Version == 20.2.0.7) &amp;&amp; #BS_GT_FO3#">The layer the collision belongs to.</add>
 
         <add name="Flags and Part Number" type="byte" default="0">FLAGS are stored in highest 3 bits:
         	Bit 7: sets the LINK property and controls whether this body is physically linked to others.
@@ -1946,8 +1946,8 @@
         Bethesda Havok. Material wrapper for varying material enums by game.
         <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
         <add name="Material" suffix="OB" type="OblivionHavokMaterial" ver2="20.0.0.5" vercond="(User Version 2 &lt; 16)">The material of the shape.</add>
-        <add name="Material" suffix="FO" type="Fallout3HavokMaterial" vercond="(Version == 20.2.0.7) &amp;&amp; (User Version 2 &lt;= 34)">The material of the shape.</add>
-        <add name="Material" suffix="SK" type="SkyrimHavokMaterial" vercond="(Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 34)">The material of the shape.</add>
+        <add name="Material" suffix="FO" type="Fallout3HavokMaterial" vercond="(Version == 20.2.0.7) &amp;&amp; #NI_BS_LTE_FO3#">The material of the shape.</add>
+        <add name="Material" suffix="SK" type="SkyrimHavokMaterial" vercond="(Version == 20.2.0.7) &amp;&amp; #BS_GT_FO3#">The material of the shape.</add>
     </compound>
 
     <compound name="OblivionSubShape" versions="#BETHESDA#">
@@ -2001,22 +2001,22 @@
     <compound name="RagdollDescriptor" versions="#BETHESDA#">
         This constraint defines a cone in which an object can rotate. The shape of the cone can be controlled in two (orthogonal) directions.
         <!-- Oblivion and Fallout 3, Havok 550 -->
-        <add name="Pivot A" type="Vector4" vercond="User Version 2 &lt;= 16">The point where the constraint is attached to its parent rigidbody.</add>
-        <add name="Plane A" type="Vector4" vercond="User Version 2 &lt;= 16">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</add>
-        <add name="Twist A" type="Vector4" vercond="User Version 2 &lt;= 16">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane A.</add>
-        <add name="Pivot B" type="Vector4" vercond="User Version 2 &lt;= 16">The point where the constraint is attached to the other rigidbody.</add>
-        <add name="Plane B" type="Vector4" vercond="User Version 2 &lt;= 16">Defines the orthogonal plane in which the shape can be controlled (the direction orthogonal on this one and Twist B).</add>
-        <add name="Twist B" type="Vector4" vercond="User Version 2 &lt;= 16">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane B.</add>
+        <add name="Pivot A" type="Vector4" vercond="#NI_BS_LTE_16#">The point where the constraint is attached to its parent rigidbody.</add>
+        <add name="Plane A" type="Vector4" vercond="#NI_BS_LTE_16#">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</add>
+        <add name="Twist A" type="Vector4" vercond="#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane A.</add>
+        <add name="Pivot B" type="Vector4" vercond="#NI_BS_LTE_16#">The point where the constraint is attached to the other rigidbody.</add>
+        <add name="Plane B" type="Vector4" vercond="#NI_BS_LTE_16#">Defines the orthogonal plane in which the shape can be controlled (the direction orthogonal on this one and Twist B).</add>
+        <add name="Twist B" type="Vector4" vercond="#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane B.</add>
 
         <!-- Fallout 3 and later, Havok 660 and 2010 -->
-        <add name="Twist A" type="Vector4" vercond="User Version 2 &gt; 16">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane A.</add>
-        <add name="Plane A" type="Vector4" vercond="User Version 2 &gt; 16">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</add>
-        <add name="Motor A" type="Vector4" vercond="User Version 2 &gt; 16">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
-        <add name="Pivot A" type="Vector4" vercond="User Version 2 &gt; 16">Point around which the object will rotate. Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
-        <add name="Twist B" type="Vector4" vercond="User Version 2 &gt; 16">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane B.</add>
-        <add name="Plane B" type="Vector4" vercond="User Version 2 &gt; 16">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</add>
-        <add name="Motor B" type="Vector4" vercond="User Version 2 &gt; 16">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
-        <add name="Pivot B" type="Vector4" vercond="User Version 2 &gt; 16">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
+        <add name="Twist A" type="Vector4" vercond="!#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane A.</add>
+        <add name="Plane A" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</add>
+        <add name="Motor A" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
+        <add name="Pivot A" type="Vector4" vercond="!#NI_BS_LTE_16#">Point around which the object will rotate. Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
+        <add name="Twist B" type="Vector4" vercond="!#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane B.</add>
+        <add name="Plane B" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</add>
+        <add name="Motor B" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
+        <add name="Pivot B" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
 
         <add name="Cone Max Angle" type="float">Maximum angle the object can rotate around the vector orthogonal on Plane A and Twist A relative to the Twist A vector. Note that Cone Min Angle is not stored, but is simply minus this angle.</add>
         <add name="Plane Min Angle" type="float">Minimum angle the object can rotate around Plane A, relative to Twist A.</add>
@@ -2025,37 +2025,37 @@
         <add name="Twist Max Angle" type="float">Maximum angle the object can rotate around Twist A, relative to Plane A.</add>
         <add name="Max Friction" type="float">Maximum friction, typically 0 or 10. In Fallout 3, typically 100.</add>
 
-        <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="User Version 2 &gt; 16" />
+        <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
     </compound>
 
     <compound name="LimitedHingeDescriptor" versions="#BETHESDA#">
         This constraint allows rotation about a specified axis, limited by specified boundaries.
     
         <!-- Oblivion and Fallout 3, Havok 550 -->
-        <add name="Pivot A" type="Vector4" vercond="User Version 2 &lt;= 16">Pivot point around which the object will rotate.</add>
-        <add name="Axis A" type="Vector4" vercond="User Version 2 &lt;= 16">Axis of rotation.</add>
-        <add name="Perp Axis In A1" type="Vector4" vercond="User Version 2 &lt;= 16">Vector in the rotation plane which defines the zero angle.</add>
-        <add name="Perp Axis In A2" type="Vector4" vercond="User Version 2 &lt;= 16">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</add>
-        <add name="Pivot B" type="Vector4" vercond="User Version 2 &lt;= 16">Pivot A in second entity coordinate system.</add>
-        <add name="Axis B" type="Vector4" vercond="User Version 2 &lt;= 16">Axis A in second entity coordinate system.</add>
-        <add name="Perp Axis In B2" type="Vector4" vercond="User Version 2 &lt;= 16">Perp Axis In A2 in second entity coordinate system.</add>
+        <add name="Pivot A" type="Vector4" vercond="#NI_BS_LTE_16#">Pivot point around which the object will rotate.</add>
+        <add name="Axis A" type="Vector4" vercond="#NI_BS_LTE_16#">Axis of rotation.</add>
+        <add name="Perp Axis In A1" type="Vector4" vercond="#NI_BS_LTE_16#">Vector in the rotation plane which defines the zero angle.</add>
+        <add name="Perp Axis In A2" type="Vector4" vercond="#NI_BS_LTE_16#">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</add>
+        <add name="Pivot B" type="Vector4" vercond="#NI_BS_LTE_16#">Pivot A in second entity coordinate system.</add>
+        <add name="Axis B" type="Vector4" vercond="#NI_BS_LTE_16#">Axis A in second entity coordinate system.</add>
+        <add name="Perp Axis In B2" type="Vector4" vercond="#NI_BS_LTE_16#">Perp Axis In A2 in second entity coordinate system.</add>
 
         <!-- Fallout 3 and later, Havok 660 and 2010 -->
         <!-- In reality Havok loads these as Transform A and Transform B using hkTransform -->
-        <add name="Axis A" type="Vector4" vercond="User Version 2 &gt; 16">Axis of rotation.</add>
-        <add name="Perp Axis In A1" type="Vector4" vercond="User Version 2 &gt; 16">Vector in the rotation plane which defines the zero angle.</add>
-        <add name="Perp Axis In A2" type="Vector4" vercond="User Version 2 &gt; 16">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</add>
-        <add name="Pivot A" type="Vector4" vercond="User Version 2 &gt; 16">Pivot point around which the object will rotate.</add>
-        <add name="Axis B" type="Vector4" vercond="User Version 2 &gt; 16">Axis A in second entity coordinate system.</add>
-        <add name="Perp Axis In B1" type="Vector4" vercond="User Version 2 &gt; 16">Perp Axis In A1 in second entity coordinate system.</add>
-        <add name="Perp Axis In B2" type="Vector4" vercond="User Version 2 &gt; 16">Perp Axis In A2 in second entity coordinate system.</add>
-        <add name="Pivot B" type="Vector4" vercond="User Version 2 &gt; 16">Pivot A in second entity coordinate system.</add>
+        <add name="Axis A" type="Vector4" vercond="!#NI_BS_LTE_16#">Axis of rotation.</add>
+        <add name="Perp Axis In A1" type="Vector4" vercond="!#NI_BS_LTE_16#">Vector in the rotation plane which defines the zero angle.</add>
+        <add name="Perp Axis In A2" type="Vector4" vercond="!#NI_BS_LTE_16#">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</add>
+        <add name="Pivot A" type="Vector4" vercond="!#NI_BS_LTE_16#">Pivot point around which the object will rotate.</add>
+        <add name="Axis B" type="Vector4" vercond="!#NI_BS_LTE_16#">Axis A in second entity coordinate system.</add>
+        <add name="Perp Axis In B1" type="Vector4" vercond="!#NI_BS_LTE_16#">Perp Axis In A1 in second entity coordinate system.</add>
+        <add name="Perp Axis In B2" type="Vector4" vercond="!#NI_BS_LTE_16#">Perp Axis In A2 in second entity coordinate system.</add>
+        <add name="Pivot B" type="Vector4" vercond="!#NI_BS_LTE_16#">Pivot A in second entity coordinate system.</add>
 
         <add name="Min Angle" type="float">Minimum rotation angle.</add>
         <add name="Max Angle" type="float">Maximum rotation angle.</add>
         <add name="Max Friction" type="float">Maximum friction, typically either 0 or 10. In Fallout 3, typically 100.</add>
 
-        <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="User Version 2 &gt; 16" />
+        <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
     </compound>
 
     <compound name="HingeDescriptor" versions="#BETHESDA#">
@@ -2111,7 +2111,7 @@
         <add name="Max Distance" type="float">Describe the max distance the object is able to travel.</add>
         <add name="Friction" type="float" >Friction.</add>
 
-        <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="User Version 2 &gt; 16" />
+        <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
     </compound>
 
     <compound name="StiffSpringDescriptor" versions="#BETHESDA#">
@@ -2409,11 +2409,11 @@
         <add name="Unknown Int 1" type="uint" ver1="10.1.0.0" />
         <add name="Havok Filter Copy" type="HavokFilter" ver1="10.1.0.0">Copy of Havok Filter</add>
         <add name="Unused 2" type="byte" arr1="4" ver1="10.1.0.0">Garbage data from memory. Matches previous Unused value.</add>
-        <add name="Unknown Int 2" type="uint" ver1="10.1.0.0" vercond="User Version 2 &gt; 34" />
+        <add name="Unknown Int 2" type="uint" ver1="10.1.0.0" vercond="#BS_GT_FO3#" />
         <add name="Collision Response 2" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT" ver1="10.1.0.0" />
         <add name="Unused Byte 2" type="byte" ver1="10.1.0.0">Skipped over when writing Collision Response and Callback Delay.</add>
         <add name="Process Contact Callback Delay 2" type="ushort" default="0xffff" ver1="10.1.0.0" />
-        <add name="Unknown Int 2" type="uint" vercond="User Version 2 &lt;= 34" />
+        <add name="Unknown Int 2" type="uint" vercond="#NI_BS_LTE_FO3#" />
         <add name="Translation" type="Vector4"> A vector that moves the body by the specified amount. Only enabled in bhkRigidBodyT objects.</add>
         <add name="Rotation" type="hkQuaternion">The rotation Yaw/Pitch/Roll to apply to the body. Only enabled in bhkRigidBodyT objects.</add>
         <add name="Linear Velocity" type="Vector4">Linear velocity.</add>
@@ -2423,34 +2423,34 @@
         <add name="Mass" type="float" default="1.0">The body's mass in kg. A mass of zero represents an immovable object.</add>
         <add name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</add>
         <add name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</add>
-        <add name="Time Factor" type="float" default="1.0" vercond="(User Version 2 &gt; 34)" />
-        <add name="Gravity Factor" type="float" default="1.0" vercond="(User Version 2 &gt; 34) &amp;&amp; (User Version 2 != 130)" />
+        <add name="Time Factor" type="float" default="1.0" vercond="#BS_GT_FO3#" />
+        <add name="Gravity Factor" type="float" default="1.0" vercond="#BS_GT_FO3# &amp;&amp; (!#BS_FO4#)" />
         <add name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</add>
-        <add name="Rolling Friction Multiplier" type="float" vercond="(User Version 2 &gt; 34)" />
+        <add name="Rolling Friction Multiplier" type="float" vercond="#BS_GT_FO3#" />
         <add name="Restitution" type="float" default="0.4">
             How "bouncy" the body is, i.e. how much energy it has after colliding. Less than 1.0 loses energy, greater than 1.0 gains energy.
             If the restitution is not 0.0 the object will need extra CPU for all new collisions.
         </add>
         <add name="Max Linear Velocity" type="float" default="104.4" ver1="10.1.0.0">Maximal linear velocity.</add>
         <add name="Max Angular Velocity" type="float" default="31.57" ver1="10.1.0.0">Maximal angular velocity.</add>
-        <add name="Penetration Depth" type="float" default="0.15" vercond="(User Version 2 != 130)" ver1="10.1.0.0">
+        <add name="Penetration Depth" type="float" default="0.15" ver1="10.1.0.0" vercond="!#BS_FO4#">
             The maximum allowed penetration for this object.
             This is a hint to the engine to see how much CPU the engine should invest to keep this object from penetrating.
             A good choice is 5% - 20% of the smallest diameter of the object.
         </add>
         <add name="Motion System" type="hkMotionType" default="MO_SYS_DYNAMIC">Motion system? Overrides Quality when on Keyframed?</add>
-        <add name="Deactivator Type" type="hkDeactivatorType" default="DEACTIVATOR_NEVER" vercond="(User Version 2 &lt;= 34)">The initial deactivator type of the body.</add>
-        <add name="Enable Deactivation" type="bool" default="1" vercond="(User Version 2 &gt; 34)" />
+        <add name="Deactivator Type" type="hkDeactivatorType" default="DEACTIVATOR_NEVER" vercond="#NI_BS_LTE_FO3#">The initial deactivator type of the body.</add>
+        <add name="Enable Deactivation" type="bool" default="1" vercond="#BS_GT_FO3#" />
         <add name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</add>
         <add name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED">The type of interaction with other objects.</add>
-        <add name="Penetration Depth" type="float" default="0.15" vercond="(User Version 2 == 130)">
+        <add name="Penetration Depth" type="float" default="0.15" vercond="#BS_FO4#">
             The maximum allowed penetration for this object.
             This is a hint to the engine to see how much CPU the engine should invest to keep this object from penetrating.
             A good choice is 5% - 20% of the smallest diameter of the object.
         </add>
-        <add name="Unknown Float 1" type="float" vercond="(User Version 2 == 130)" />
+        <add name="Unknown Float 1" type="float" vercond="#BS_FO4#" />
         <add name="Unknown Bytes 1" type="byte" arr1="12" />
-        <add name="Unknown Bytes 2" type="byte" arr1="4" vercond="(User Version 2 &gt; 34)" />
+        <add name="Unknown Bytes 2" type="byte" arr1="4" vercond="#BS_GT_FO3#" />
         <add name="Num Constraints" type="uint" />
         <add name="Constraints" type="Ref" template="bhkSerializable" arr1="Num Constraints" />
         <add name="Body Flags" type="uint" vercond="(User Version 2 &lt; 76)">1 = respond to wind</add>
@@ -2612,7 +2612,7 @@
         <add name="MOPP Data Size" type="uint" calculated="1">Number of bytes for MOPP data.</add>
         <add name="Origin" type="Vector3" ver1="10.1.0.0">Origin of the object in mopp coordinates. This is the minimum of all vertices in the packed shape along each axis, minus 0.1.</add>
         <add name="Scale" type="float" ver1="10.1.0.0">The scaling factor to quantize the MOPP: the quantization factor is equal to 256*256 divided by this number. In Oblivion files, scale is taken equal to 256*256*254 / (size + 0.2) where size is the largest dimension of the bounding box of the packed shape.</add>
-        <add name="Build Type" type="MoppDataBuildType" vercond="User Version 2 &gt; 34">Tells if MOPP Data was organized into smaller chunks (PS3) or not (PC)</add>
+        <add name="Build Type" type="MoppDataBuildType" vercond="#BS_GT_FO3#">Tells if MOPP Data was organized into smaller chunks (PS3) or not (PC)</add>
         <add name="MOPP Data" type="byte" binary="1" arr1="MOPP Data Size">The tree of bounding volume data.</add>
     </niobject>
 
@@ -2824,7 +2824,7 @@
 
     <niobject name="NiObjectNET" abstract="1" inherit="NiObject">
         Abstract base class for NiObjects that support names, extra data, and time controllers.
-        <add name="Skyrim Shader Type" type="BSLightingShaderPropertyShaderType" vercond="User Version 2 &gt;= 83" cond="BSLightingShaderProperty">Configures the main shader path</add>
+        <add name="Skyrim Shader Type" type="BSLightingShaderPropertyShaderType" vercond="#BS_GTE_SKY#" cond="BSLightingShaderProperty">Configures the main shader path</add>
         <add name="Name" type="string">Name of this controllable object, used to refer to the object in .kf files.</add>
         <add name="Legacy Extra Data" type="LegacyExtraData" ver2="2.3" />
         <add name="Extra Data" type="Ref" template="NiExtraData" ver1="3.0" ver2="4.2.2.0">Extra data object index. (The first in a chain)</add>
@@ -2901,8 +2901,8 @@
         <add name="Rotation" type="Matrix33">The rotation part of the transformation matrix.</add>
         <add name="Scale" type="float" default="1.0">Scaling part (only uniform scaling is supported).</add>
         <add name="Velocity" type="Vector3" ver2="4.2.2.0">Unknown function. Always seems to be (0, 0, 0)</add>
-        <add name="Num Properties" type="uint" vercond="(User Version 2 &lt;= 34)" />
-        <add name="Properties" type="Ref" template="NiProperty" arr1="Num Properties" vercond="(User Version 2 &lt;= 34)">All rendering properties attached to this object.</add>
+        <add name="Num Properties" type="uint" vercond="#NI_BS_LTE_FO3#" />
+        <add name="Properties" type="Ref" template="NiProperty" arr1="Num Properties" vercond="#NI_BS_LTE_FO3#">All rendering properties attached to this object.</add>
         <add name="Unknown 1" type="uint" arr1="4" ver2="2.3" />
         <add name="Unknown 2" type="byte" ver2="2.3" />
         <add name="Has Bounding Volume" type="bool" ver1="3.0" ver2="4.2.2.0" />
@@ -2912,12 +2912,12 @@
 
     <niobject name="NiDynamicEffect" abstract="1" inherit="NiAVObject">
         Abstract base class for dynamic effects such as NiLights or projected texture effects.
-        <add name="Switch State" type="bool" default="1" ver1="10.1.0.106" vercond="User Version 2 &lt; 130">If true, then the dynamic effect is applied to affected nodes during rendering.</add>
+        <add name="Switch State" type="bool" default="1" ver1="10.1.0.106" vercond="#NI_BS_LT_FO4#">If true, then the dynamic effect is applied to affected nodes during rendering.</add>
         <add name="Num Affected Nodes" type="uint" ver2="4.0.0.2" />
         <add name="Affected Nodes" type="Ptr" template="NiNode" arr1="Num Affected Nodes" ver2="3.3.0.13">If a node appears in this list, then its entire subtree will be affected by the effect.</add>
         <add name="Affected Node Pointers" type="uint" arr1="Num Affected Nodes" ver1="4.0.0.0" ver2="4.0.0.2">As of 4.0 the pointer hash is no longer stored alongside each NiObject on disk, yet this node list still refers to the pointer hashes. Cannot leave the type as Ptr because the link will be invalid.</add>
-        <add name="Num Affected Nodes" type="uint" ver1="10.1.0.0" vercond="User Version 2 &lt; 130" />
-        <add name="Affected Nodes" type="Ptr" template="NiNode" arr1="Num Affected Nodes" ver1="10.1.0.0" vercond="User Version 2 &lt; 130">If a node appears in this list, then its entire subtree will be affected by the effect.</add>
+        <add name="Num Affected Nodes" type="uint" ver1="10.1.0.0" vercond="#NI_BS_LT_FO4#" />
+        <add name="Affected Nodes" type="Ptr" template="NiNode" arr1="Num Affected Nodes" ver1="10.1.0.0" vercond="#NI_BS_LT_FO4#">If a node appears in this list, then its entire subtree will be affected by the effect.</add>
     </niobject>
 
     <niobject name="NiLight" abstract="1" inherit="NiDynamicEffect">
@@ -3205,10 +3205,10 @@
         <add name="Num LODs" type="uint">Number of LODs.</add>
         <add name="Num Node Groups" type="uint">Number of node arrays.</add>
         <add name="Node Groups" type="NodeSet" arr1="Num LODs">A list of node sets (each set a sequence of bones).</add>
-        <add name="Num Shape Groups" type="uint" ver1="4.2.2.0" vercond="(User Version 2 == 0)">Number of shape groups.</add>
-        <add name="Shape Groups 1" type="SkinInfoSet" arr1="Num Shape Groups" ver1="4.2.2.0" vercond="(User Version 2 == 0)">List of shape groups.</add>
-        <add name="Num Shape Groups 2" type="uint" ver1="4.2.2.0" vercond="(User Version 2 == 0)">The size of the second list of shape groups.</add>
-        <add name="Shape Groups 2" type="Ref" template="NiTriBasedGeom" arr1="Num Shape Groups 2" ver1="4.2.2.0" vercond="(User Version 2 == 0)">Group of NiTriShape indices.</add>
+        <add name="Num Shape Groups" type="uint" ver1="4.2.2.0" vercond="#NISTREAM#">Number of shape groups.</add>
+        <add name="Shape Groups 1" type="SkinInfoSet" arr1="Num Shape Groups" ver1="4.2.2.0" vercond="#NISTREAM#">List of shape groups.</add>
+        <add name="Num Shape Groups 2" type="uint" ver1="4.2.2.0" vercond="#NISTREAM#">The size of the second list of shape groups.</add>
+        <add name="Shape Groups 2" type="Ref" template="NiTriBasedGeom" arr1="Num Shape Groups 2" ver1="4.2.2.0" vercond="#NISTREAM#">Group of NiTriShape indices.</add>
     </niobject>
 
     <niobject name="NiBSBoneLODController" inherit="NiBoneLODController">
@@ -3237,18 +3237,18 @@
              This causes massive inheritance problems so the rows below are doubled up to exclude NiParticleSystem for Bethesda Stream 100+.
         -->
         <!-- BSGeometry: Used by Bethesda Stream 100+ NiParticleSystem -->
-        <add name="Bound" type="NiBound" vercond="(User Version 2 &gt;= 100)" cond="NiParticleSystem" />
-        <add name="Skin" type="Ref" template="NiObject" vercond="(User Version 2 &gt;= 100)" cond="NiParticleSystem" />
+        <add name="Bound" type="NiBound" vercond="#BS_GTE_SSE#" cond="NiParticleSystem" />
+        <add name="Skin" type="Ref" template="NiObject" vercond="#BS_GTE_SSE#" cond="NiParticleSystem" />
         <!-- NiGeometry: Each row is doubled in order to exclude NiParticleSystem for Bethesda Stream 100+ -->
-        <add name="Data" type="Ref" template="NiGeometryData" vercond="(User Version 2 &lt; 100)">Data index (NiTriShapeData/NiTriStripData).</add>
-        <add name="Data" type="Ref" template="NiGeometryData" vercond="(User Version 2 &gt;= 100)" cond="!NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</add>
-        <add name="Skin Instance" type="Ref" template="NiSkinInstance" ver1="3.3.0.13" vercond="(User Version 2 &lt; 100)" />
-        <add name="Skin Instance" type="Ref" template="NiSkinInstance" vercond="(User Version 2 &gt;= 100)" cond="!NiParticleSystem" />
-        <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="(User Version 2 &lt; 100)" />
-        <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="(User Version 2 &gt;= 100)" cond="!NiParticleSystem" />
+        <add name="Data" type="Ref" template="NiGeometryData" vercond="#NI_BS_LT_SSE#">Data index (NiTriShapeData/NiTriStripData).</add>
+        <add name="Data" type="Ref" template="NiGeometryData" vercond="#BS_GTE_SSE#" cond="!NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</add>
+        <add name="Skin Instance" type="Ref" template="NiSkinInstance" ver1="3.3.0.13" vercond="#NI_BS_LT_SSE#" />
+        <add name="Skin Instance" type="Ref" template="NiSkinInstance" vercond="#BS_GTE_SSE#" cond="!NiParticleSystem" />
+        <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#NI_BS_LT_SSE#" />
+        <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#BS_GTE_SSE#" cond="!NiParticleSystem" />
         <!-- Bethesda -->
-        <add name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" vercond="(User Version 2 &gt; 34)" />
-        <add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" vercond="(User Version 2 &gt; 34)" />
+        <add name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
     </niobject>
 
     <niobject name="NiTriBasedGeom" abstract="1" inherit="NiGeometry">
@@ -3301,21 +3301,21 @@
         -->
         <add name="Group ID" type="int" ver1="10.1.0.114">Always zero.</add>
         <add name="Num Vertices" type="ushort" cond="!NiPSysData">Number of vertices.</add>
-        <add name="Num Vertices" type="ushort" cond="NiPSysData" vercond="(User Version 2 &lt; 34)">Number of vertices.</add>
-        <add name="BS Max Vertices" type="ushort" cond="NiPSysData" vercond="(User Version 2 &gt;= 34)">Bethesda uses this for max number of particles in NiPSysData.</add>
+        <add name="Num Vertices" type="ushort" cond="NiPSysData" vercond="#NI_BS_LT_FO3#">Number of vertices.</add>
+        <add name="BS Max Vertices" type="ushort" cond="NiPSysData" vercond="#BS_GTE_FO3#">Bethesda uses this for max number of particles in NiPSysData.</add>
         <add name="Keep Flags" type="byte" ver1="10.1.0.0">Used with NiCollision objects when OBB or TRI is set.</add>
         <add name="Compress Flags" type="byte" ver1="10.1.0.0" />
         <add name="Has Vertices" type="bool" default="1">Is the vertex array present? (Always non-zero.)</add>
         <add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Has Vertices">The mesh vertices.</add>
-        <add name="Vector Flags" type="VectorFlags" ver1="10.0.1.0" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
-        <add name="BS Vector Flags" type="BSVectorFlags" vercond="((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
-        <add name="Material CRC" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 &gt; 34" />
+        <add name="Vector Flags" type="VectorFlags" ver1="10.0.1.0" vercond="!#BS202#" />
+        <add name="BS Vector Flags" type="BSVectorFlags" vercond="#BS202#" />
+        <add name="Material CRC" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
         <add name="Has Normals" type="bool">Do we have lighting normals? These are essential for proper lighting: if not present, the model will only be influenced by ambient light.</add>
         <add name="Normals" type="Vector3" arr1="Num Vertices" cond="Has Normals">The lighting normals.</add>
         <add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Tangent vectors.</add>
         <add name="Bitangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Bitangent vectors.</add>
-        <add name="Has DIV2 Floats" type="bool" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
-        <add name="DIV2 Floats" type="float" arr1="Num Vertices" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" cond="Has DIV2 Floats" />
+        <add name="Has DIV2 Floats" type="bool" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
+        <add name="DIV2 Floats" type="float" arr1="Num Vertices" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" cond="Has DIV2 Floats" />
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Has Vertex Colors" type="bool">
             Do we have vertex colors? These are usually used to fine-tune the lighting of the model.
@@ -3436,26 +3436,26 @@
         <add name="Num Particles" type="ushort" ver2="4.0.0.2">The maximum number of particles (matches the number of vertices).</add>
         <add name="Particle Radius" type="float" ver2="10.0.1.0">The particles' size.</add>
         <add name="Has Radii" type="bool" ver1="10.1.0.0">Is the particle size array present?</add>
-        <add name="Radii" type="float" arr1="Num Vertices" cond="Has Radii" ver1="10.1.0.0" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))">The individual particle sizes.</add>
+        <add name="Radii" type="float" arr1="Num Vertices" cond="Has Radii" ver1="10.1.0.0" vercond="!#BS202#">The individual particle sizes.</add>
         <add name="Num Active" type="ushort">The number of active particles at the time the system was saved. This is also the number of valid entries in the following arrays.</add>
         <add name="Has Sizes" type="bool">Is the particle size array present?</add>
-        <add name="Sizes" type="float" arr1="Num Vertices" cond="Has Sizes" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))">The individual particle sizes.</add>
+        <add name="Sizes" type="float" arr1="Num Vertices" cond="Has Sizes" vercond="!#BS202#">The individual particle sizes.</add>
         <add name="Has Rotations" type="bool" ver1="10.0.1.0">Is the particle rotation array present?</add>
-        <add name="Rotations" type="Quaternion" arr1="Num Vertices" cond="Has Rotations" ver1="10.0.1.0" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))">The individual particle rotations.</add>
+        <add name="Rotations" type="Quaternion" arr1="Num Vertices" cond="Has Rotations" ver1="10.0.1.0" vercond="!#BS202#">The individual particle rotations.</add>
         <add name="Has Rotation Angles" type="bool" ver1="20.0.0.4">Are the angles of rotation present?</add>
-        <add name="Rotation Angles" type="float" arr1="Num Vertices" cond="Has Rotation Angles" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))">Angles of rotation</add>
+        <add name="Rotation Angles" type="float" arr1="Num Vertices" cond="Has Rotation Angles" vercond="!#BS202#">Angles of rotation</add>
         <add name="Has Rotation Axes" type="bool" ver1="20.0.0.4">Are axes of rotation present?</add>
-        <add name="Rotation Axes" type="Vector3" arr1="Num Vertices" cond="Has Rotation Axes" ver1="20.0.0.4" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))">Axes of rotation.</add>
+        <add name="Rotation Axes" type="Vector3" arr1="Num Vertices" cond="Has Rotation Axes" ver1="20.0.0.4" vercond="!#BS202#">Axes of rotation.</add>
         <!-- Bethesda -->
-        <add name="Has Texture Indices" type="bool" vercond="((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
-        <add name="Num Subtexture Offsets" type="uint" vercond="(User Version 2 &gt; 34)">How many quads to use in BSPSysSubTexModifier for texture atlasing</add>
-        <add name="Num Subtexture Offsets" type="byte" vercond="(Version == 20.2.0.7) &amp;&amp; (User Version 2 &lt;= 34) &amp;&amp; (User Version 2 &gt; 0)">2,4,8,16,32,64 are potential values. If "Has" was no then this should be 256, which represents a 16x16 framed image, which is invalid</add>
-        <add name="Subtexture Offsets" type="Vector4" arr1="Num Subtexture Offsets" vercond="((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))">Defines UV offsets</add>
-        <add name="Aspect Ratio" type="float" vercond="(User Version 2 &gt; 34)">Sets aspect ratio for Subtexture Offset UV quads</add>
-        <add name="Aspect Flags" type="ushort" vercond="(User Version 2 &gt; 34)" />
-        <add name="Speed to Aspect Aspect 2" type="float" vercond="(User Version 2 &gt; 34)" />
-        <add name="Speed to Aspect Speed 1" type="float" vercond="(User Version 2 &gt; 34)" />
-        <add name="Speed to Aspect Speed 2" type="float" vercond="(User Version 2 &gt; 34)" />
+        <add name="Has Texture Indices" type="bool" vercond="#BS202#" />
+        <add name="Num Subtexture Offsets" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#">How many quads to use in BSPSysSubTexModifier for texture atlasing</add>
+        <add name="Num Subtexture Offsets" type="byte" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BSSTREAM# #AND# #NI_BS_LTE_FO3#">2,4,8,16,32,64 are potential values. If "Has" was no then this should be 256, which represents a 16x16 framed image, which is invalid</add>
+        <add name="Subtexture Offsets" type="Vector4" arr1="Num Subtexture Offsets" vercond="#BS202#">Defines UV offsets</add>
+        <add name="Aspect Ratio" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#">Sets aspect ratio for Subtexture Offset UV quads</add>
+        <add name="Aspect Flags" type="ushort" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <add name="Speed to Aspect Aspect 2" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <add name="Speed to Aspect Speed 1" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <add name="Speed to Aspect Speed 2" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
     </niobject>
 
     <niobject name="NiRotatingParticlesData" inherit="NiParticlesData" until="V10_0_1_0">
@@ -3481,11 +3481,11 @@
     <niobject name="NiPSysData" inherit="NiParticlesData">
         Particle system data.
         <!-- `!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))` means "Not Bethesda 20.2" -->
-        <add name="Particle Descriptions" type="ParticleDesc" arr1="Num Vertices" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
+        <add name="Particle Descriptions" type="ParticleDesc" arr1="Num Vertices" vercond="!#BS202#" />
         <add name="Has Rotation Speeds" type="bool" ver1="20.0.0.2" />
-        <add name="Rotation Speeds" type="float" arr1="Num Vertices" cond="Has Rotation Speeds" ver1="20.0.0.2" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
-        <add name="Num Added Particles" type="ushort" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
-        <add name="Added Particles Base" type="ushort" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))" />
+        <add name="Rotation Speeds" type="float" arr1="Num Vertices" cond="Has Rotation Speeds" ver1="20.0.0.2" vercond="!#BS202#" />
+        <add name="Num Added Particles" type="ushort" vercond="!#BS202#" />
+        <add name="Added Particles Base" type="ushort" vercond="!#BS202#" />
     </niobject>
     
     <niobject name="NiMeshPSysData" inherit="NiPSysData">
@@ -3654,9 +3654,9 @@
         <add name="Name" type="string">The sequence name by which the animation system finds and manages this sequence.</add>
         <add name="Accum Root Name" type="string" ver2="10.1.0.103">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
         <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver2="10.1.0.103" />
-        <add name="Num DIV2 Ints" type="int" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
-        <add name="DIV2 Ints" type="int" arr1="Num DIV2 Ints" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
-        <add name="DIV2 Ref" type="Ref" template="NiObject" ver1="20.3.0.9" ver2="20.3.0.9" vercond="(User Version == 0x20000) || (User Version == 0x30000)" />
+        <add name="Num DIV2 Ints" type="int" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
+        <add name="DIV2 Ints" type="int" arr1="Num DIV2 Ints" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
+        <add name="DIV2 Ref" type="Ref" template="NiObject" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
         <add name="Num Controlled Blocks" type="uint" />
         <add name="Array Grow By" type="uint" ver1="10.1.0.106" />
         <add name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" />
@@ -3840,8 +3840,8 @@
         Generic node object for grouping.
         <add name="Num Children" type="uint">The number of child objects.</add>
         <add name="Children" type="Ref" template="NiAVObject" arr1="Num Children">List of child node object indices.</add>
-        <add name="Num Effects" type="uint" vercond="User Version 2 &lt; 130">The number of references to effect objects that follow.</add>
-        <add name="Effects" type="Ref" template="NiDynamicEffect" arr1="Num Effects" vercond="User Version 2 &lt; 130">List of node effects. ADynamicEffect?</add>
+        <add name="Num Effects" type="uint" vercond="#NI_BS_LT_FO4#">The number of references to effect objects that follow.</add>
+        <add name="Effects" type="Ref" template="NiDynamicEffect" arr1="Num Effects" vercond="#NI_BS_LT_FO4#">List of node effects. ADynamicEffect?</add>
     </niobject>
 
     <niobject name="NiBone" inherit="NiNode">
@@ -3972,7 +3972,7 @@
 
     <niobject name="NiParticles" inherit="NiGeometry">
         Generic particle system node.
-        <add name="Vertex Desc" type="BSVertexDesc" vercond="(User Version 2 &gt;= 100)" />
+        <add name="Vertex Desc" type="BSVertexDesc" vercond="#BS_GTE_SSE#" />
     </niobject>
 
     <niobject name="NiAutoNormalParticles" inherit="NiParticles" until="V10_0_1_0">
@@ -3991,11 +3991,11 @@
     <niobject name="NiParticleSystem" inherit="NiParticles">
         A particle system.
         <!-- Bethesda -->
-        <add name="Far Begin" type="ushort" vercond="(User Version 2 &gt;= 83)" />
-        <add name="Far End" type="ushort" vercond="(User Version 2 &gt;= 83)" />
-        <add name="Near Begin" type="ushort" vercond="(User Version 2 &gt;= 83)" />
-        <add name="Near End" type="ushort" vercond="(User Version 2 &gt;= 83)" />
-        <add name="Data" type="Ref" template="NiPSysData" vercond="(User Version 2 &gt;= 100)" />
+        <add name="Far Begin" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Far End" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Near Begin" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Near End" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Data" type="Ref" template="NiPSysData" vercond="#BS_GTE_SSE#" />
         <!-- / Bethesda -->
         <add name="World Space" type="bool" default="1" ver1="10.1.0.0">If true, Particles are birthed into world space.  If false, Particles are birthed into object space.</add>
         <add name="Num Modifiers" type="uint" ver1="10.1.0.0">The number of modifier references.</add>
@@ -4247,7 +4247,7 @@
         <add name="Force Type" type="ForceType">The type of gravitational force.</add>
         <add name="Turbulence" type="float">Adds a degree of randomness.</add>
         <add name="Turbulence Scale" type="float" default="1.0">Scale for turbulence.</add>
-        <add name="World Aligned" type="bool" vercond="User Version 2 &gt; 16" />
+        <add name="World Aligned" type="bool" vercond="!#NI_BS_LTE_16#" />
     </niobject>
 
     <niobject name="NiPSysGrowFadeModifier" inherit="NiPSysModifier">
@@ -4256,7 +4256,7 @@
         <add name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</add>
         <add name="Fade Time" type="float">The time taken to shrink from their specified size to 0.</add>
         <add name="Fade Generation" type="ushort">Specifies the particle generation to which the shrink effect should be applied. This is usually the highest supported generation for the particle system.</add>
-        <add name="Base Scale" type="float" vercond="User Version 2 &gt;= 34">A multiplier on the base particle scale.</add>
+        <add name="Base Scale" type="float" vercond="#BS_GTE_FO3#">A multiplier on the base particle scale.</add>
     </niobject>
 
     <niobject name="NiPSysMeshEmitter" inherit="NiPSysEmitter">
@@ -4519,7 +4519,7 @@
 
     <niobject name="NiShadeProperty" inherit="NiProperty">
         Determines whether flat shading or smooth shading is used on a shape.
-        <add name="Flags" type="Flags" default="1" vercond="(User Version 2 &lt;= 34)">
+        <add name="Flags" type="Flags" default="1" vercond="#NI_BS_LTE_FO3#">
             Bit 0: Enable smooth phong shading on this shape. Otherwise, hard-edged flat shading will be used on this shape.
         </add>
     </niobject>
@@ -4553,12 +4553,12 @@
     <niobject name="NiSkinPartition" inherit="NiObject">
         Skinning data, optimized for hardware skinning. The mesh is partitioned in submeshes such that each vertex of a submesh is influenced only by a limited and fixed number of bones.
         <add name="Num Skin Partition Blocks" type="uint" />
-		<add name="Skin Partition Blocks" type="SkinPartition" arr1="Num Skin Partition Blocks" vercond="!((Version == 20.2.0.7) &amp;&amp; (User Version 2 == 100))">Skin partition objects.</add>
-		<add name="Data Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
-		<add name="Vertex Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
-		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
-		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" arr1="Data Size / Vertex Size" cond="Data Size &gt; 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
-		<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver1="20.2.0.7" ver2="20.2.0.7" vercond="User Version 2 == 100" />
+		<add name="Skin Partition Blocks" type="SkinPartition" arr1="Num Skin Partition Blocks" vercond="!#BS_SSE#">Skin partition objects.</add>
+		<add name="Data Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<add name="Vertex Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" arr1="Data Size / Vertex Size" cond="Data Size &gt; 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
     </niobject>
 
     <niobject name="NiTexture" abstract="1" inherit="NiObjectNET">
@@ -5561,15 +5561,15 @@
     
     <niobject name="BSShaderProperty" inherit="NiShadeProperty" versions="#FO3_AND_LATER#">
         Bethesda-specific property.
-        <add name="Shader Type" type="BSShaderType" default="SHADER_DEFAULT" vercond="(User Version 2 &lt;= 34)" />
-        <add name="Shader Flags" type="BSShaderFlags" default="0x82000000" vercond="(User Version 2 &lt;= 34)" />
-        <add name="Shader Flags 2" type="BSShaderFlags2" default="1" vercond="(User Version 2 &lt;= 34)" />
-        <add name="Environment Map Scale" type="float" default="1.0" vercond="(User Version 2 &lt;= 34)">Scales the intensity of the environment/cube map.</add>
+        <add name="Shader Type" type="BSShaderType" default="SHADER_DEFAULT" vercond="#NI_BS_LTE_FO3#" />
+        <add name="Shader Flags" type="BSShaderFlags" default="0x82000000" vercond="#NI_BS_LTE_FO3#" />
+        <add name="Shader Flags 2" type="BSShaderFlags2" default="1" vercond="#NI_BS_LTE_FO3#" />
+        <add name="Environment Map Scale" type="float" default="1.0" vercond="#NI_BS_LTE_FO3#">Scales the intensity of the environment/cube map.</add>
     </niobject>
 
     <niobject name="BSShaderLightingProperty" abstract="1" inherit="BSShaderProperty" versions="#FO3#">
         Bethesda-specific property.
-        <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" vercond="(User Version 2 &lt;= 34)">How to handle texture borders.</add>
+        <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" vercond="#NI_BS_LTE_FO3#">How to handle texture borders.</add>
     </niobject>
 
     <niobject name="BSShaderNoLightingProperty" inherit="BSShaderLightingProperty" versions="#FO3#">
@@ -5589,7 +5589,7 @@
         <add name="Parallax Max Passes" type="float" default="4.0" vercond="(User Version 2 &gt; 24)">The number of passes the parallax shader can apply.</add>
         <add name="Parallax Scale" type="float" default="1.0" vercond="(User Version 2 &gt; 24)">The strength of the parallax.</add>
         <!-- TODO: Find where this could have even come from as > 34 doesn't exist for this block. -->
-        <add name="Emissive Color" type="Color4" vercond="(User Version 2 &gt; 34)">Glow color and alpha</add>
+        <add name="Emissive Color" type="Color4" vercond="#BS_GT_FO3#">Glow color and alpha</add>
     </niobject>
 
     <!-- Skyrim specific Node -->
@@ -5851,40 +5851,40 @@
 
     <niobject name="BSLightingShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Bethesda shader property for Skyrim and later.
-        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="(User Version 2 != 130)" default="2185233153">Skyrim Shader Flags for setting render/shader options.</add>
-        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="(User Version 2 != 130)" default="32801">Skyrim Shader Flags for setting render/shader options.</add>
-        <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" vercond="(User Version 2 == 130)" default="2151678465">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
-        <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" vercond="(User Version 2 == 130)" default="1">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
+        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="!#BS_FO4#" default="2185233153">Skyrim Shader Flags for setting render/shader options.</add>
+        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="!#BS_FO4#" default="32801">Skyrim Shader Flags for setting render/shader options.</add>
+        <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" vercond="#BS_FO4#" default="2151678465">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
+        <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" vercond="#BS_FO4#" default="1">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
         <add name="UV Offset" type="TexCoord">Offset UVs</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set, can have override in an esm/esp</add>
         <add name="Emissive Color" type="Color3" default="#VEC3_ZERO#">Glow color and alpha</add>
         <add name="Emissive Multiple" type="float">Multiplied emissive colors</add>
-        <add name="Wet Material" type="string" vercond="(User Version 2 == 130)" />
+        <add name="Wet Material" type="string" vercond="#BS_FO4#" />
         <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T">How to handle texture borders.</add>
         <add name="Alpha" type="float" default="1.0">The material opacity (1=non-transparent).</add>
         <add name="Refraction Strength" type="float">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
-        <add name="Glossiness" type="float" default="80" vercond="User Version 2 &lt; 130">The material specular power, or glossiness (0-999).</add>
-        <add name="Smoothness" type="float" default="1.0" vercond="(User Version 2 == 130)">The base roughness (0.0-1.0), multiplied by the smoothness map.</add>
+        <add name="Glossiness" type="float" default="80" vercond="#NI_BS_LT_FO4#">The material specular power, or glossiness (0-999).</add>
+        <add name="Smoothness" type="float" default="1.0" vercond="#BS_FO4#">The base roughness (0.0-1.0), multiplied by the smoothness map.</add>
         <add name="Specular Color" type="Color3">Adds a colored highlight.</add>
         <add name="Specular Strength" type="float" default="1.0">Brightness of specular highlight. (0=not visible) (0-999)</add>
-        <add name="Lighting Effect 1" type="float" default="0.3" vercond="User Version 2 &lt; 130">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
-        <add name="Lighting Effect 2" type="float" default="2.0" vercond="User Version 2 &lt; 130">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
-        <add name="Subsurface Rolloff" type="float" default="0.3" vercond="(User Version 2 == 130)" />
-        <add name="Rimlight Power" type="float" default="3.402823466e+38" vercond="(User Version 2 == 130)" />
-        <add name="Backlight Power" type="float" cond="Rimlight Power == 0x7F7FFFFF" vercond="(User Version 2 == 130)" />
-        <add name="Grayscale to Palette Scale" type="float" vercond="(User Version 2 == 130)" />
-        <add name="Fresnel Power" type="float" default="5.0" vercond="(User Version 2 == 130)" />
-        <add name="Wetness Spec Scale" type="float" default="-1.0" vercond="(User Version 2 == 130)" />
-        <add name="Wetness Spec Power" type="float" default="-1.0" vercond="(User Version 2 == 130)" />
-        <add name="Wetness Min Var" type="float" default="-1.0" vercond="(User Version 2 == 130)" />
-        <add name="Wetness Env Map Scale" type="float" default="-1.0" vercond="(User Version 2 == 130)" />
-        <add name="Wetness Fresnel Power" type="float" default="-1.0" vercond="(User Version 2 == 130)" />
-        <add name="Wetness Metalness" type="float" default="-1.0" vercond="(User Version 2 == 130)" />
+        <add name="Lighting Effect 1" type="float" default="0.3" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
+        <add name="Lighting Effect 2" type="float" default="2.0" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
+        <add name="Subsurface Rolloff" type="float" default="0.3" vercond="#BS_FO4#" />
+        <add name="Rimlight Power" type="float" default="#FLT_MAX#" vercond="#BS_FO4#" />
+        <add name="Backlight Power" type="float" cond="Rimlight Power == 0x7F7FFFFF" vercond="#BS_FO4#" />
+        <add name="Grayscale to Palette Scale" type="float" vercond="#BS_FO4#" />
+        <add name="Fresnel Power" type="float" default="5.0" vercond="#BS_FO4#" />
+        <add name="Wetness Spec Scale" type="float" default="-1.0" vercond="#BS_FO4#" />
+        <add name="Wetness Spec Power" type="float" default="-1.0" vercond="#BS_FO4#" />
+        <add name="Wetness Min Var" type="float" default="-1.0" vercond="#BS_FO4#" />
+        <add name="Wetness Env Map Scale" type="float" default="-1.0" vercond="#BS_FO4#" />
+        <add name="Wetness Fresnel Power" type="float" default="-1.0" vercond="#BS_FO4#" />
+        <add name="Wetness Metalness" type="float" default="-1.0" vercond="#BS_FO4#" />
         <add name="Environment Map Scale" type="float" default="1.0" cond="Skyrim Shader Type == 1">Scales the intensity of the environment/cube map. (0-1)</add>
-        <add name="Unknown Env Map Short" type="ushort" cond="Skyrim Shader Type == 1" vercond="(User Version 2 == 130)" />
+        <add name="Unknown Env Map Short" type="ushort" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
         <add name="Skin Tint Color" type="Color3" cond="Skyrim Shader Type == 5">Tints the base texture. Overridden by game settings.</add>
-        <add name="Unknown Skin Tint Int" type="uint" cond="Skyrim Shader Type == 5" vercond="(User Version 2 == 130)" />
+        <add name="Unknown Skin Tint Int" type="uint" cond="Skyrim Shader Type == 5" vercond="#BS_FO4#" />
         <add name="Hair Tint Color" type="Color3" cond="Skyrim Shader Type == 6">Tints the base texture. Overridden by game settings.</add>
         <add name="Max Passes" type="float" cond="Skyrim Shader Type == 7">Max Passes</add>
         <add name="Scale" type="float" cond="Skyrim Shader Type == 7">Scale</add>
@@ -5900,10 +5900,10 @@
 
     <niobject name="BSEffectShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Bethesda effect shader property for Skyrim and later.
-        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="2147483648" vercond="(User Version 2 != 130)" />
-        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="32" vercond="(User Version 2 != 130)" />
-        <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" default="2147483648" vercond="(User Version 2 == 130)" />
-        <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" default="32" vercond="(User Version 2 == 130)" />
+        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="2147483648" vercond="!#BS_FO4#" />
+        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="32" vercond="!#BS_FO4#" />
+        <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" default="2147483648" vercond="#BS_FO4#" />
+        <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" default="32" vercond="#BS_FO4#" />
         <add name="UV Offset" type="TexCoord">Offset UVs</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures</add>
         <add name="Source Texture"  type="SizedString">points to an external texture.</add>
@@ -5921,10 +5921,10 @@
         <add name="Emissive Multiple" type="float">Multiplier for Emissive Color (RGB part)</add>
         <add name="Soft Falloff Depth" type="float"></add>
         <add name="Greyscale Texture"  type="SizedString">Points to an external texture, used as palette for SLSF1_Greyscale_To_PaletteColor/SLSF1_Greyscale_To_PaletteAlpha.</add>
-        <add name="Env Map Texture" type="SizedString" vercond="(User Version 2 == 130)" />
-        <add name="Normal Texture" type="SizedString" vercond="(User Version 2 == 130)" />
-        <add name="Env Mask Texture" type="SizedString" vercond="(User Version 2 == 130)" />
-        <add name="Environment Map Scale" type="float" vercond="(User Version 2 == 130)" />
+        <add name="Env Map Texture" type="SizedString" vercond="#BS_FO4#" />
+        <add name="Normal Texture" type="SizedString" vercond="#BS_FO4#" />
+        <add name="Env Mask Texture" type="SizedString" vercond="#BS_FO4#" />
+        <add name="Environment Map Scale" type="float" vercond="#BS_FO4#" />
     </niobject>
     
     <bitflags name="SkyrimWaterShaderFlags" storage="byte" versions="#SKY_AND_LATER#">
@@ -6151,7 +6151,7 @@
     <niobject name="BSMultiBoundNode" inherit="NiNode" versions="#FO3_AND_LATER#">
         Bethesda-specific node.
         <add name="Multi Bound" type="Ref" template="BSMultiBound" />
-		<add name="Culling Mode" type="BSCPCullingType" vercond="(User Version 2 &gt;= 83)" />
+		<add name="Culling Mode" type="BSCPCullingType" vercond="#BS_GTE_SKY#" />
     </niobject>
 
     <niobject name="BSMultiBound" inherit="NiObject" versions="#FO3_AND_LATER#">
@@ -6186,14 +6186,14 @@
 
     <compound name="BSGeometrySegmentData" versions="#FO3_AND_LATER#">
         Bethesda-specific. Describes groups of triangles either segmented in a grid (for LOD) or by body part for skinned FO4 meshes.
-        <add name="Flags" type="byte" vercond="(User Version 2 &lt; 130)" />
-        <add name="Index" type="uint" vercond="(User Version 2 &lt; 130)">Index = previous Index + previous Num Tris in Segment * 3</add>
-        <add name="Num Tris in Segment" type="uint" vercond="(User Version 2 &lt; 130)">The number of triangles belonging to this segment</add>
-        <add name="Start Index" type="uint" vercond="User Version 2 == 130" />
-        <add name="Num Primitives" type="uint" vercond="User Version 2 == 130" />
-        <add name="Parent Array Index" type="uint" vercond="User Version 2 == 130" />
-        <add name="Num Sub Segments" type="uint" vercond="User Version 2 == 130" />
-        <add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="User Version 2 == 130" />
+        <add name="Flags" type="byte" vercond="#NI_BS_LT_FO4#" />
+        <add name="Index" type="uint" vercond="#NI_BS_LT_FO4#">Index = previous Index + previous Num Tris in Segment * 3</add>
+        <add name="Num Tris in Segment" type="uint" vercond="#NI_BS_LT_FO4#">The number of triangles belonging to this segment</add>
+        <add name="Start Index" type="uint" vercond="#BS_FO4#" />
+        <add name="Num Primitives" type="uint" vercond="#BS_FO4#" />
+        <add name="Parent Array Index" type="uint" vercond="#BS_FO4#" />
+        <add name="Num Sub Segments" type="uint" vercond="#BS_FO4#" />
+        <add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="#BS_FO4#" />
     </compound>
 
     <niobject name="BSSegmentedTriShape" inherit="NiTriShape" versions="#FO3_AND_LATER#">
@@ -7458,17 +7458,17 @@
         <add name="Shader Property" type="Ref" template="BSShaderProperty" />
         <add name="Alpha Property" type="Ref" template="NiAlphaProperty" />
         <add name="Vertex Desc" type="BSVertexDesc" />
-        <add name="Num Triangles" type="uint" vercond="User Version 2 == 130" />
-        <add name="Num Triangles" type="ushort" vercond="User Version 2 &lt; 130" />
+        <add name="Num Triangles" type="uint" vercond="#BS_FO4#" />
+        <add name="Num Triangles" type="ushort" vercond="#NI_BS_LT_FO4#" />
         <add name="Num Vertices" type="ushort" />
         <add name="Data Size" type="uint" />
-        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" vercond="User Version 2 == 130" />
-        <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" vercond="User Version 2 == 100" />
+        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" vercond="#BS_FO4#" />
+        <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" vercond="#BS_SSE#" />
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size &gt; 0" />
-        <add name="Particle Data Size" type="uint" vercond="User Version 2 == 100" />
-        <add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" vercond="User Version 2 == 100" />
-        <add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" vercond="User Version 2 == 100" />
-        <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" vercond="User Version 2 == 100" />
+        <add name="Particle Data Size" type="uint" vercond="#BS_SSE#" />
+        <add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" vercond="#BS_SSE#" />
+        <add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" vercond="#BS_SSE#" />
+        <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" vercond="#BS_SSE#" />
     </niobject>
 
     <niobject name="BSMeshLODTriShape" inherit="BSTriShape" versions="#FO4#">
@@ -7497,13 +7497,13 @@
 
     <niobject name="BSSubIndexTriShape" inherit="BSTriShape" versions="#SSE# #FO4#">
         Fallout 4 Sub-Index Tri Shape
-		<add name="Num Primitives" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
-		<add name="Num Segments" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
-		<add name="Total Segments" type="uint" vercond="User Version 2 == 130" cond="Data Size &gt; 0" />
-		<add name="Segment" type="BSGeometrySegmentData" vercond="User Version 2 == 130" arr1="Num Segments" cond="Data Size &gt; 0" />
-		<add name="Segment Data" type="BSGeometrySegmentSharedData" vercond="User Version 2 == 130" cond="(Num Segments &lt; Total Segments) &amp;&amp; (Data Size &gt; 0)" />
-		<add name="Num Segments" type="uint" vercond="User Version 2 == 100" />
-		<add name="Segment" type="BSGeometrySegmentData" vercond="User Version 2 == 100" arr1="Num Segments" />
+		<add name="Num Primitives" type="uint" vercond="#BS_FO4#" cond="Data Size &gt; 0" />
+		<add name="Num Segments" type="uint" vercond="#BS_FO4#" cond="Data Size &gt; 0" />
+		<add name="Total Segments" type="uint" vercond="#BS_FO4#" cond="Data Size &gt; 0" />
+		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_FO4#" arr1="Num Segments" cond="Data Size &gt; 0" />
+		<add name="Segment Data" type="BSGeometrySegmentSharedData" vercond="#BS_FO4#" cond="(Num Segments &lt; Total Segments) &amp;&amp; (Data Size &gt; 0)" />
+		<add name="Num Segments" type="uint" vercond="#BS_SSE#" />
+		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_SSE#" arr1="Num Segments" />
     </niobject>
     
     <!-- Fallout 4 Physics -->

From fe3b87c9a87901acfe26df43b3504fe32b71b8a4 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 5 Jun 2018 07:04:27 -0400
Subject: [PATCH 32/86] Remove `cond` for type checking, add `onlyT` and
 `excludeT` for #76

The `cond` attribute was being overloaded with multiple functions.  Conditions should be actual expressions, using local or inherited data.  Type checking inside of `cond` would also mean that you could do both in one expression, such as `cond="NiParticleSystem && Num Vertices > 0"` which doesn't make any sense.

So, `onlyT` and `excludeT` were made to serve that function.  Two attributes also means not having to use the unary not (!) in order negate the meaning.

Existing logic can simply alias the attributes to cond if need be.
---
 nif.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nif.xml b/nif.xml
index 885eec7..0bf143d 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2687,7 +2687,7 @@
 
     <niobject name="NiExtraData" inherit="NiObject">
         A generic extra data object.
-        <add name="Name" type="string" ver1="10.0.1.0" cond="!BSExtraData">Name of this object.</add>
+        <add name="Name" type="string" ver1="10.0.1.0" excludeT="BSExtraData">Name of this object.</add>
         <add name="Next Extra Data" type="Ref" template="NiExtraData" ver2="4.2.2.0">Block number of the next extra data object.</add>
         <add name="Extra Data" type="ByteArray" ver2="3.3.0.13">The extra data was sometimes stored as binary directly on NiExtraData.</add>
         <add name="Num Bytes" type="uint" ver1="4.0.0.0" ver2="4.2.2.0">Ignore binary data after 4.x as the child block will cover it.</add>
@@ -2824,7 +2824,7 @@
 
     <niobject name="NiObjectNET" abstract="1" inherit="NiObject">
         Abstract base class for NiObjects that support names, extra data, and time controllers.
-        <add name="Skyrim Shader Type" type="BSLightingShaderPropertyShaderType" vercond="#BS_GTE_SKY#" cond="BSLightingShaderProperty">Configures the main shader path</add>
+        <add name="Skyrim Shader Type" type="BSLightingShaderPropertyShaderType" vercond="#BS_GTE_SKY#" onlyT="BSLightingShaderProperty">Configures the main shader path</add>
         <add name="Name" type="string">Name of this controllable object, used to refer to the object in .kf files.</add>
         <add name="Legacy Extra Data" type="LegacyExtraData" ver2="2.3" />
         <add name="Extra Data" type="Ref" template="NiExtraData" ver1="3.0" ver2="4.2.2.0">Extra data object index. (The first in a chain)</add>
@@ -3237,15 +3237,15 @@
              This causes massive inheritance problems so the rows below are doubled up to exclude NiParticleSystem for Bethesda Stream 100+.
         -->
         <!-- BSGeometry: Used by Bethesda Stream 100+ NiParticleSystem -->
-        <add name="Bound" type="NiBound" vercond="#BS_GTE_SSE#" cond="NiParticleSystem" />
-        <add name="Skin" type="Ref" template="NiObject" vercond="#BS_GTE_SSE#" cond="NiParticleSystem" />
+        <add name="Bound" type="NiBound" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
+        <add name="Skin" type="Ref" template="NiObject" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
         <!-- NiGeometry: Each row is doubled in order to exclude NiParticleSystem for Bethesda Stream 100+ -->
         <add name="Data" type="Ref" template="NiGeometryData" vercond="#NI_BS_LT_SSE#">Data index (NiTriShapeData/NiTriStripData).</add>
-        <add name="Data" type="Ref" template="NiGeometryData" vercond="#BS_GTE_SSE#" cond="!NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</add>
+        <add name="Data" type="Ref" template="NiGeometryData" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</add>
         <add name="Skin Instance" type="Ref" template="NiSkinInstance" ver1="3.3.0.13" vercond="#NI_BS_LT_SSE#" />
-        <add name="Skin Instance" type="Ref" template="NiSkinInstance" vercond="#BS_GTE_SSE#" cond="!NiParticleSystem" />
+        <add name="Skin Instance" type="Ref" template="NiSkinInstance" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
         <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#NI_BS_LT_SSE#" />
-        <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#BS_GTE_SSE#" cond="!NiParticleSystem" />
+        <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
         <!-- Bethesda -->
         <add name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
         <add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
@@ -3300,9 +3300,9 @@
            do not have length for NiPSysData regardless of "Num" or booleans.
         -->
         <add name="Group ID" type="int" ver1="10.1.0.114">Always zero.</add>
-        <add name="Num Vertices" type="ushort" cond="!NiPSysData">Number of vertices.</add>
-        <add name="Num Vertices" type="ushort" cond="NiPSysData" vercond="#NI_BS_LT_FO3#">Number of vertices.</add>
-        <add name="BS Max Vertices" type="ushort" cond="NiPSysData" vercond="#BS_GTE_FO3#">Bethesda uses this for max number of particles in NiPSysData.</add>
+        <add name="Num Vertices" type="ushort" excludeT="NiPSysData">Number of vertices.</add>
+        <add name="Num Vertices" type="ushort" onlyT="NiPSysData" vercond="#NI_BS_LT_FO3#">Number of vertices.</add>
+        <add name="BS Max Vertices" type="ushort" onlyT="NiPSysData" vercond="#BS_GTE_FO3#">Bethesda uses this for max number of particles in NiPSysData.</add>
         <add name="Keep Flags" type="byte" ver1="10.1.0.0">Used with NiCollision objects when OBB or TRI is set.</add>
         <add name="Compress Flags" type="byte" ver1="10.1.0.0" />
         <add name="Has Vertices" type="bool" default="1">Is the vertex array present? (Always non-zero.)</add>

From 120f4763dd1918e4a61941b69a0aa07eaefd9d9f Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 5 Jun 2018 09:24:44 -0400
Subject: [PATCH 33/86] Rename count to countable, add `size` to basic

For #76

`bool` type is something that has to be dealt with as it changes size.  Also it's marked as countable which should probably be analyzed... It shouldn't be used in array counts.
---
 nif.xml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/nif.xml b/nif.xml
index 0bf143d..b3f1f00 100644
--- a/nif.xml
+++ b/nif.xml
@@ -167,44 +167,44 @@
 
     <!--Basic Types-->
 
-    <basic name="bool" count="1">
+    <basic name="bool" countable="true">
         A boolean; 32-bit from 4.0.0.2, and 8-bit from 4.1.0.1 on.
     </basic>
 
-    <basic name="byte" count="1">
+    <basic name="byte" countable="true" size="1">
         An unsigned 8-bit integer.
     </basic>
 
-    <basic name="uint" count="1">
+    <basic name="uint" countable="true" size="4">
         An unsigned 32-bit integer.
     </basic>
 
-    <basic name="ulittle32" count="1">
+    <basic name="ulittle32" countable="true" size="4">
         A litte-endian unsigned 32-bit integer.
     </basic>
 
-    <basic name="ushort" count="1">
+    <basic name="ushort" countable="true" size="2">
         An unsigned 16-bit integer.
     </basic>
 
-    <basic name="int" count="1">
+    <basic name="int" countable="true" size="4">
         A signed 32-bit integer.
     </basic>
 
-    <basic name="short" count="1">
+    <basic name="short" countable="true" size="2">
         A signed 16-bit integer.
     </basic>
 
-    <basic name="BlockTypeIndex" count="0">
+    <basic name="BlockTypeIndex" countable="false" size="2">
         A 16-bit (signed?) integer, which is used in the header to refer to a particular object type in a object type string array.
         The upper bit appears to be a flag used for PhysX block types.
     </basic>
 
-    <basic name="char" count="0">
+    <basic name="char" countable="false" size="1">
         An 8-bit character.
     </basic>
 
-    <basic name="FileVersion" count="0">
+    <basic name="FileVersion" countable="false" size="4">
         A 32-bit integer that stores the version in hexadecimal format with each byte representing a number in the version string.
 
         Some widely-used versions and their hex representation:
@@ -220,42 +220,42 @@
         20.0.0.5:   0x14000005
     </basic>
 
-    <basic name="Flags" count="0">
+    <basic name="Flags" countable="false" size="2">
         A 16-bit integer, used for bit flags.  Function varies by object type.
     </basic>
 
-    <basic name="float" count="0">
+    <basic name="float" countable="false" size="4">
         A standard 32-bit floating point number.
     </basic>
     
-    <basic name="hfloat" count="0">
+    <basic name="hfloat" countable="false" size="2">
         A 16-bit floating point number.
     </basic>
     
-    <basic name="HeaderString" count="0">
+    <basic name="HeaderString" countable="false">
         A variable length string that ends with a newline character (0x0A).  The string starts as follows depending on the version:
 
         Version &lt;= 10.0.1.0:  'NetImmerse File Format'
         Version &gt;= 10.1.0.0:  'Gamebryo File Format'
     </basic>
 
-    <basic name="LineString" count="0">
+    <basic name="LineString" countable="false">
         A variable length string that ends with a newline character (0x0A).
     </basic>
 
-    <basic name="Ptr" count="0" istemplate="1">
+    <basic name="Ptr" countable="false" istemplate="1" size="4">
         A signed 32-bit integer, referring to a object before this one in the hierarchy.  Examples:  Bones, gravity objects.
     </basic>
 
-    <basic name="Ref" count="0" istemplate="1">
+    <basic name="Ref" countable="false" istemplate="1" size="4">
         A signed 32-bit integer, used to refer to another object; -1 means no reference. These should always point down the hierarchy. Other types are used for indexes that point to objects higher up.
     </basic>
 
-    <basic name="StringOffset" count="0">
+    <basic name="StringOffset" countable="false" size="4">
         A 32-bit unsigned integer, used to refer to strings in a NiStringPalette.
     </basic>
 
-    <basic name="StringIndex" count="0">
+    <basic name="StringIndex" countable="false" size="4">
         A 32-bit unsigned integer, used to refer to strings in the header.
     </basic>
     

From 04fe24d25392555f55459911a8b5234042d1b8a3 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 5 Jun 2018 10:02:45 -0400
Subject: [PATCH 34/86] Add `size` to compounds

For #76
---
 nif.xml | 138 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/nif.xml b/nif.xml
index b3f1f00..2a08d0e 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1331,21 +1331,21 @@
         <add name="Data" type="byte" arr1="Data Size 2" arr2="Data Size 1">The bytes which make up the array</add>
     </compound>
 
-    <compound name="Color3">
+    <compound name="Color3" size="12">
         A color without alpha (red, green, blue).
         <add name="r" type="float">Red color component.</add>
         <add name="g" type="float">Green color component.</add>
         <add name="b" type="float">Blue color component.</add>
     </compound>
 
-    <compound name="ByteColor3">
+    <compound name="ByteColor3" size="3">
         A color without alpha (red, green, blue).
         <add name="r" type="byte">Red color component.</add>
         <add name="g" type="byte">Green color component.</add>
         <add name="b" type="byte">Blue color component.</add>
     </compound>
 
-    <compound name="Color4">
+    <compound name="Color4" size="16">
         A color with alpha (red, green, blue, alpha).
         <add name="r" type="float">Red component.</add>
         <add name="g" type="float">Green component.</add>
@@ -1353,7 +1353,7 @@
         <add name="a" type="float">Alpha.</add>
     </compound>
 
-    <compound name="ByteColor4">
+    <compound name="ByteColor4" size="4">
         A color with alpha (red, green, blue, alpha).
         <add name="r" type="byte">Red color component.</add>
         <add name="g" type="byte">Green color component.</add>
@@ -1386,28 +1386,28 @@
         <add name="Vertex Indices" type="ushort" arr1="Num Vertices">The vertex indices.</add>
     </compound>
     
-    <compound name="ByteVector3">
+    <compound name="ByteVector3" size="3">
         A vector in 3D space (x,y,z).
         <add name="x" type="byte">First coordinate.</add>
         <add name="y" type="byte">Second coordinate.</add>
         <add name="z" type="byte">Third coordinate.</add>
     </compound>
     
-    <compound name="HalfVector3">
+    <compound name="HalfVector3" size="6">
         A vector in 3D space (x,y,z).
         <add name="x" type="hfloat">First coordinate.</add>
         <add name="y" type="hfloat">Second coordinate.</add>
         <add name="z" type="hfloat">Third coordinate.</add>
     </compound>
 
-    <compound name="Vector3">
+    <compound name="Vector3" size="12">
         A vector in 3D space (x,y,z).
         <add name="x" type="float">First coordinate.</add>
         <add name="y" type="float">Second coordinate.</add>
         <add name="z" type="float">Third coordinate.</add>
     </compound>
 
-    <compound name="Vector4">
+    <compound name="Vector4" size="16">
         A 4-dimensional vector.
         <add name="x" type="float">First coordinate.</add>
         <add name="y" type="float">Second coordinate.</add>
@@ -1415,7 +1415,7 @@
         <add name="w" type="float">Fourth coordinate.</add>
     </compound>
 
-    <compound name="Quaternion">
+    <compound name="Quaternion" size="16">
         A quaternion.
         <add name="w" type="float" default="1.0">The w-coordinate.</add>
         <add name="x" type="float" default="0.0">The x-coordinate.</add>
@@ -1423,7 +1423,7 @@
         <add name="z" type="float" default="0.0">The z-coordinate.</add>
     </compound>
 
-    <compound name="hkQuaternion" versions="#BETHESDA#">
+    <compound name="hkQuaternion" size="16" versions="#BETHESDA#">
         A quaternion as it appears in the havok objects.
         <add name="x" type="float" default="0.0">The x-coordinate.</add>
         <add name="y" type="float" default="0.0">The y-coordinate.</add>
@@ -1431,7 +1431,7 @@
         <add name="w" type="float" default="1.0">The w-coordinate.</add>
     </compound>
 
-    <compound name="Matrix22">
+    <compound name="Matrix22" size="16">
         A 2x2 matrix of float values.  Stored in OpenGL column-major format.
         <add name="m11" type="float" default="1.0">Member 1,1 (top left)</add>
         <add name="m21" type="float" default="0.0">Member 2,1 (bottom left)</add>
@@ -1439,7 +1439,7 @@
         <add name="m22" type="float" default="1.0">Member 2,2 (bottom right)</add>
     </compound>
 
-    <compound name="Matrix33">
+    <compound name="Matrix33" size="36">
         A 3x3 rotation matrix; M^T M=identity, det(M)=1.    Stored in OpenGL column-major format.
         <add name="m11" type="float" default="1.0">Member 1,1 (top left)</add>
         <add name="m21" type="float" default="0.0">Member 2,1</add>
@@ -1452,7 +1452,7 @@
         <add name="m33" type="float" default="1.0">Member 3,3 (bottom left)</add>
     </compound>
 
-    <compound name="Matrix34">
+    <compound name="Matrix34" size="48">
         A 3x4 transformation matrix.
         <add name="m11" type="float" default="1.0">The (1,1) element.</add>
         <add name="m21" type="float" default="0.0">The (2,1) element.</add>
@@ -1468,7 +1468,7 @@
         <add name="m34" type="float" default="0.0">The (3,4) element.</add>
     </compound>
 
-    <compound name="Matrix44">
+    <compound name="Matrix44" size="64">
         A 4x4 transformation matrix.
         <add name="m11" type="float" default="1.0">The (1,1) element.</add>
         <add name="m21" type="float" default="0.0">The (2,1) element.</add>
@@ -1488,7 +1488,7 @@
         <add name="m44" type="float" default="1.0">The (4,4) element.</add>
     </compound>
 
-    <compound name="hkMatrix3" versions="#BETHESDA#">
+    <compound name="hkMatrix3" size="48" versions="#BETHESDA#">
         A 3x3 Havok matrix stored in 4x3 due to memory alignment.
         <add name="m11" type="float" default="1.0" />
         <add name="m12" type="float" />
@@ -1504,7 +1504,7 @@
         <add name="m34" type="float">Unused</add>
     </compound>
 
-    <compound name="MipMap">
+    <compound name="MipMap" size="12">
         Description of a mipmap within an NiPixelData object.
         <add name="Width" type="uint">Width of the mipmap image.</add>
         <add name="Height" type="uint">Height of the mipmap image.</add>
@@ -1523,7 +1523,7 @@
         <add name="Value" type="char" arr1="Length">The string itself, null terminated (the null terminator is taken into account in the length byte).</add>
     </compound>
 
-    <compound name="SkinInfo" since="V4_2_2_0">
+    <compound name="SkinInfo" size="8" since="V4_2_2_0">
         NiBoneLODController::SkinInfo. Reference to shape and skin instance.
         <add name="Shape" type="Ptr" template="NiTriBasedGeom" />
         <add name="Skin Instance" type="Ref" template="NiSkinInstance" />
@@ -1535,7 +1535,7 @@
         <add name="Skin Info" type="SkinInfo" arr1="Num Skin Info" />
     </compound>
 
-    <compound name="BoneVertData">
+    <compound name="BoneVertData" size="6">
         NiSkinData::BoneVertData. A vertex and its weight.
         <add name="Index" type="ushort">The vertex index, in the mesh.</add>
         <add name="Weight" type="float">The vertex weight - between 0.0 and 1.0</add>
@@ -1621,7 +1621,7 @@
         <add name="Length" type="uint">Length of the palette string is repeated here.</add>
     </compound>
 
-    <compound name="TBC">
+    <compound name="TBC" size="12">
         Tension, bias, continuity.
         <add name="t" type="float">Tension.</add>
         <add name="b" type="float">Bias.</add>
@@ -1652,13 +1652,13 @@
         <add name="TBC" type="TBC" cond="ARG == 3">The TBC of the key.</add>
     </compound>
 
-    <compound name="TexCoord">
+    <compound name="TexCoord" size="8">
         Texture coordinates (u,v). As in OpenGL; image origin is in the lower left corner.
         <add name="u" type="float">First coordinate.</add>
         <add name="v" type="float">Second coordinate.</add>
     </compound>
     
-    <compound name="HalfTexCoord">
+    <compound name="HalfTexCoord" size="4">
         Texture coordinates (u,v).
         <add name="u" type="hfloat">First coordinate.</add>
         <add name="v" type="hfloat">Second coordinate.</add>
@@ -1700,7 +1700,7 @@
         <add name="Map ID" type="uint" cond="Has Map">Unique identifier for the Gamebryo shader system.</add>
     </compound>
 
-    <compound name="Triangle">
+    <compound name="Triangle" size="6">
         List of three vertex indices.
         <add name="v1" type="ushort">First vertex index.</add>
         <add name="v2" type="ushort">Second vertex index.</add>
@@ -1758,7 +1758,7 @@
 		<add name="Eye Data" type="float" cond="ARG &amp; 0x1000" />
 	</compound>
 
-    <compound name="BSVertexDesc" versions="#SSE# #FO4#">
+    <compound name="BSVertexDesc" size="8" versions="#SSE# #FO4#">
         <add name="VF1" type="byte" />
         <add name="VF2" type="byte" />
         <add name="VF3" type="byte" />
@@ -1795,7 +1795,7 @@
 		<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
     </compound>
 
-    <compound name="NiPlane">
+    <compound name="NiPlane" size="16">
         A plane.
         <add name="Normal" type="Vector3">The plane normal.</add>
         <add name="Constant" type="float">The plane constant.</add>
@@ -1824,7 +1824,7 @@
         <add name="TRS Valid" type="bool" arr1="3" ver2="10.1.0.109">Whether each transform component is valid.</add>
     </compound>
 
-    <compound name="NiTransform">
+    <compound name="NiTransform" size="52">
         <add name="Rotation" type="Matrix33">The rotation part of the transformation matrix.</add>
         <add name="Translation" type="Vector3">The translation vector.</add>
         <add name="Scale" type="float" default="1.0">Scaling part (only uniform scaling is supported).</add>
@@ -1874,7 +1874,7 @@
         <add name="Vectors" type="Vector3" arr1="ARG">Morph vectors.</add>
     </compound>
 
-    <compound name="Particle">
+    <compound name="Particle" size="40">
         particle array entry
         <add name="Velocity" type="Vector3">Particle velocity</add>
         <add name="Unknown Vector" type="Vector3" />
@@ -1894,7 +1894,7 @@
         <add name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver1="4.2.2.0" cond="ARG != 0">The vertex weights.</add>
     </compound>
 
-    <compound name="HavokFilter" versions="#BETHESDA#">
+    <compound name="HavokFilter" size="4" versions="#BETHESDA#">
         Bethesda Havok. Collision filter info representing Layer, Flags, Part Number, and Group all combined into one uint.
         <add name="Layer" suffix="OB" type="OblivionLayer" default="OL_STATIC" ver2="20.0.0.5" vercond="(User Version 2 &lt; 16)">The layer the collision belongs to.</add>
         <add name="Layer" suffix="FO" type="Fallout3Layer" default="FOL_STATIC" vercond="(Version == 20.2.0.7) &amp;&amp; #NI_BS_LTE_FO3#">The layer the collision belongs to.</add>
@@ -1957,7 +1957,7 @@
         <add name="Material" type="HavokMaterial">The material of the subshape.</add>
     </compound>
 
-    <compound name="bhkPositionConstraintMotor" versions="#BETHESDA#">
+    <compound name="bhkPositionConstraintMotor" size="25" versions="#BETHESDA#">
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
         <add name="Tau" type="float" default="0.8">Relative stiffness</add>
@@ -1967,7 +1967,7 @@
         <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
     </compound>
 
-    <compound name="bhkVelocityConstraintMotor" versions="#BETHESDA#">
+    <compound name="bhkVelocityConstraintMotor" size="18" versions="#BETHESDA#">
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
         <add name="Tau" type="float" default="0">Relative stiffness</add>
@@ -1976,7 +1976,7 @@
         <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
     </compound>
 
-    <compound name="bhkSpringDamperConstraintMotor" versions="#BETHESDA#">
+    <compound name="bhkSpringDamperConstraintMotor" size="17" versions="#BETHESDA#">
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
         <add name="Spring Constant" type="float" default="0">The spring constant in N/m</add>
@@ -2080,7 +2080,7 @@
         <!-- no friction -->
     </compound>
 
-    <compound name="BallAndSocketDescriptor" versions="#BETHESDA#">
+    <compound name="BallAndSocketDescriptor" size="32" versions="#BETHESDA#">
         <add name="Pivot A" type="Vector4">Pivot point in the local space of entity A.</add>
         <add name="Pivot B" type="Vector4">Pivot point in the local space of entity B.</add>
     </compound>
@@ -2114,13 +2114,13 @@
         <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
     </compound>
 
-    <compound name="StiffSpringDescriptor" versions="#BETHESDA#">
+    <compound name="StiffSpringDescriptor" size="36" versions="#BETHESDA#">
         <add name="Pivot A" type="Vector4" />
         <add name="Pivot B" type="Vector4" />
         <add name="Length" type="float" />
     </compound>
 
-    <compound name="OldSkinData">
+    <compound name="OldSkinData" size="18">
         Used to store skin weights in NiTriShapeSkinController.
         <add name="Vertex Weight" type="float">The amount that this bone affects the vertex.</add>
         <add name="Vertex Index" type="ushort">The index of the vertex that this weight applies to.</add>
@@ -2133,14 +2133,14 @@
         <option value="2" name="RGBA">Colors store red, blue, green, and alpha components.</option>
     </enum>
 
-    <compound name="BoxBV">
+    <compound name="BoxBV" size="60">
         Box Bounding Volume
         <add name="Center" type="Vector3" />
         <add name="Axis" type="Vector3" arr1="3" />
         <add name="Extent" type="Vector3" />
     </compound>
 
-    <compound name="CapsuleBV">
+    <compound name="CapsuleBV" size="32">
         Capsule Bounding Volume
         <add name="Center" type="Vector3" />
         <add name="Origin" type="Vector3" />
@@ -2148,7 +2148,7 @@
         <add name="Radius" type="float" />
     </compound>
 
-    <compound name="HalfSpaceBV">
+    <compound name="HalfSpaceBV" size="28">
         <add name="Plane" type="NiPlane" />
         <add name="Center" type="Vector3" />
     </compound>
@@ -2167,12 +2167,12 @@
         <add name="Bounding Volumes" type="BoundingVolume" arr1="Num BV" />
     </compound>
 
-    <compound name="MorphWeight">
+    <compound name="MorphWeight" size="8">
         <add name="Interpolator" type="Ref" template="NiInterpolator" />
         <add name="Weight" type="float" />
     </compound>
 
-    <compound name="BoneTransform">
+    <compound name="BoneTransform" size="40">
         Transformation data for the bone at this index in bhkPoseArray.
         <add name="Translation" type="Vector3" />
         <add name="Rotation" type="hkQuaternion" />
@@ -2198,25 +2198,25 @@
         <option value="8" name="PF_START_NET_BONESET">Start a new shared boneset.  It is expected this BoneSet and the following sets in the Skin Partition will have the same bones.</option>
     </bitflags>
 
-    <compound name="BodyPartList" versions="#BETHESDA#">
+    <compound name="BodyPartList" size="4" versions="#BETHESDA#">
         Body part list for DismemberSkinInstance
         <add name="Part Flag" type="BSPartFlag" default="257">Flags related to the Body Partition</add>
         <add name="Body Part" type="BSDismemberBodyPartType">Body Part Index</add>
     </compound>
     
-    <compound name="BoneLOD">
+    <compound name="BoneLOD" size="8">
         Stores Bone Level of Detail info in a BSBoneLODExtraData
         <add name="Distance" type="uint" />
         <add name="Bone Name" type="string" />
     </compound>
 
-    <compound name="bhkCMSDMaterial" versions="#SKY_AND_LATER#">
+    <compound name="bhkCMSDMaterial" size="8" versions="#SKY_AND_LATER#">
         Per-chunk material, used in bhkCompressedMeshShapeData
         <add name="Material" type="SkyrimHavokMaterial" />
         <add name="Filter" type="HavokFilter" />
     </compound>
 
-    <compound name="bhkCMSDBigTris" versions="#SKY_AND_LATER#">
+    <compound name="bhkCMSDBigTris" size="12" versions="#SKY_AND_LATER#">
         Triangle indices used in pair with "Big Verts" in a bhkCompressedMeshShapeData.
         <add name="Triangle 1" type="ushort" />
         <add name="Triangle 2" type="ushort" />
@@ -2225,7 +2225,7 @@
         <add name="Welding Info" type="ushort" />
     </compound>
     
-    <compound name="bhkCMSDTransform" versions="#SKY_AND_LATER#">
+    <compound name="bhkCMSDTransform" size="32" versions="#SKY_AND_LATER#">
         A set of transformation data: translation and rotation
         <add name="Translation" type="Vector4">A vector that moves the chunk by the specified amount. W is not used.</add>
         <add name="Rotation" type="hkQuaternion">Rotation. Reference point for rotation is bhkRigidBody translation.</add>
@@ -2356,7 +2356,7 @@
         <option value="3" name="BROAD_PHASE_BORDER" />
     </enum>
 
-    <compound name="hkWorldObjCinfoProperty" versions="#BETHESDA#">
+    <compound name="hkWorldObjCinfoProperty" size="12" versions="#BETHESDA#">
         <add name="Data" type="uint" default="0" />
         <add name="Size" type="uint" default="0" />
         <add name="Capacity and Flags" type="uint" default="0x80000000" />
@@ -2503,7 +2503,7 @@
         <add name="Ball and Socket" type="BallAndSocketDescriptor">Describes a ball and socket constraint</add>
     </niobject>
 
-    <compound name="ConstraintInfo" versions="#BETHESDA#">
+    <compound name="ConstraintInfo" size="32" versions="#BETHESDA#">
         Two Vector4 for pivot in A and B.
         <add name="Pivot In A" type="Vector4" />
         <add name="Pivot In B" type="Vector4" />
@@ -4565,7 +4565,7 @@
         A texture.
     </niobject>
 
-    <compound name="FormatPrefs">
+    <compound name="FormatPrefs" size="12">
         NiTexture::FormatPrefs. These preferences are a request to the renderer to use a format the most closely matches the settings and may be ignored.
         <add name="Pixel Layout" type="PixelLayout">Requests the way the image will be stored.</add>
         <add name="Use Mipmaps" type="MipMapFormat" default="MIP_FMT_DEFAULT">Requests if mipmaps are used or not.</add>
@@ -5009,12 +5009,12 @@
         <option name="NX_SCT_CLOTH" value="2" />
     </enum>
 
-    <compound name="PhysXSceneDescMaterial" since="V20_2_0_8">
+    <compound name="PhysXSceneDescMaterial" size="6" since="V20_2_0_8">
         <add name="Key" type="ushort" />
         <add name="Material" type="Ref" template="NiPhysXMaterialDesc" />
     </compound>
 
-    <compound name="PhysXSceneDescCompartment" since="V20_2_0_8">
+    <compound name="PhysXSceneDescCompartment" size="20" since="V20_2_0_8">
         <add name="ID" type="uint" />
         <add name="Type" type="NxCompartmentType" />
         <add name="Device Code" type="uint" />
@@ -5091,12 +5091,12 @@
         <add name="Prop Description" type="Ref" template="NiPhysXPropDesc" />
     </niobject>
 
-    <compound name="PhysXMaterialRef" since="V20_2_0_8">
+    <compound name="PhysXMaterialRef" size="6" since="V20_2_0_8">
         <add name="Key" type="ushort" />
         <add name="Material Desc" type="Ref" template="NiPhysXMaterialDesc" />
     </compound>
 
-    <compound name="PhysXStateName" since="V20_2_0_8">
+    <compound name="PhysXStateName" size="8" since="V20_2_0_8">
         <add name="Name" type="string" />
         <add name="Index" type="uint" />
     </compound>
@@ -5194,21 +5194,21 @@
         <option name="NX_JPM_LINEAR_MINDIST" value="2" />
     </enum>
 
-    <compound name="NiPhysXJointActor" since="V20_2_0_8">
+    <compound name="NiPhysXJointActor" size="40" since="V20_2_0_8">
         <add name="Actor" type="Ref" template="NiPhysXActorDesc" />
         <add name="Local Normal" type="Vector3" />
         <add name="Local Axis" type="Vector3" />
         <add name="Local Anchor" type="Vector3" />
     </compound>
 
-    <compound name="NxJointLimitSoftDesc" since="V20_2_0_8">
+    <compound name="NxJointLimitSoftDesc" size="16" since="V20_2_0_8">
         <add name="Value" type="float" />
         <add name="Restitution" type="float" />
         <add name="Spring" type="float" />
         <add name="Damping" type="float" />
     </compound>
 
-    <compound name="NxJointDriveDesc" since="V20_2_0_8">
+    <compound name="NxJointDriveDesc" size="16" since="V20_2_0_8">
         <add name="Drive Type" type="NxD6JointDriveType" />
         <add name="Restitution" type="float" />
         <add name="Spring" type="float" />
@@ -5279,12 +5279,12 @@
         <option name="NX_SHAPE_COMPOUND" value="9" />
     </enum>
 
-    <compound name="NxPlane" since="V20_2_0_8">
+    <compound name="NxPlane" size="16" since="V20_2_0_8">
         <add name="Val 1" type="float" />
         <add name="Point 1" type="Vector3" />
     </compound>
 
-    <compound name="NxCapsule" since="V20_2_0_8">
+    <compound name="NxCapsule" size="12" since="V20_2_0_8">
         <add name="Val 1" type="float" />
         <add name="Val 2" type="float" />
         <add name="Capsule Flags" type="uint" />
@@ -5332,7 +5332,7 @@
         <option name="NX_MF_DISABLE_STRONG_FRICTION" value="6" />
     </bitflags>
 
-    <compound name="NxSpringDesc" since="V20_2_0_8">
+    <compound name="NxSpringDesc" size="12" since="V20_2_0_8">
         <add name="Spring" type="float" />
         <add name="Damper" type="float" />
         <add name="Target Value" type="float" />
@@ -5409,7 +5409,7 @@
         <add name="Lines" type="bool" arr1="Num Vertices">Is vertex connected to other (next?) vertex?</add>
     </niobject>
 
-    <compound name="Polygon">
+    <compound name="Polygon" size="8">
         Two dimensional screen elements.
         <add name="Num Vertices" type="ushort" />
         <add name="Vertex Offset" type="ushort">Offset in vertex array.</add>
@@ -6092,7 +6092,7 @@
         <add name="Unknown Float 2" type="float" />
     </niobject>
 
-    <compound name="BSTreadTransform" versions="#FO3_AND_LATER#">
+    <compound name="BSTreadTransform" size="68" versions="#FO3_AND_LATER#">
         Bethesda-specific compound.
         <add name="Name" type="string" />
         <add name="Transform 1" type="NiQuatTransform" />
@@ -6176,7 +6176,7 @@
         <add name="Radius" type="float" />
     </niobject>
 
-    <compound name="BSGeometrySubSegment" versions="#FO3_AND_LATER#">
+    <compound name="BSGeometrySubSegment" size="16" versions="#FO3_AND_LATER#">
         This is only defined because of recursion issues.
         <add name="Start Index" type="uint" />
         <add name="Num Primitives" type="uint" />
@@ -6330,7 +6330,7 @@
         <add name="Constraint" type="ConstraintData" arr1="Num Constraints" />
     </niobject>
 
-    <compound name="Region" since="V20_5_0_0">
+    <compound name="Region" size="8" since="V20_5_0_0">
         A range of indices, which make up a region (such as a submesh).
         <add name="Start Index" type="uint" />
         <add name="Num Indices" type="uint" />
@@ -6443,7 +6443,7 @@
         <add name="Streamable" type="bool" default="1" />
     </niobject>
 
-    <compound name="SemanticData" since="V20_5_0_0">
+    <compound name="SemanticData" size="8" since="V20_5_0_0">
         <add name="Name" type="string">
             Type of data (POSITION, POSITION_BP, INDEX, NORMAL, NORMAL_BP,
             TEXCOORD, BLENDINDICES, BLENDWEIGHT, BONE_PALETTE, COLOR, DISPLAYLIST,
@@ -6521,12 +6521,12 @@
         <add name="Unknown 6" type="int" />
     </compound>
 
-    <compound name="WeightDataEpicMickey" versions="V20_6_5_0_DEM">
+    <compound name="WeightDataEpicMickey" size="24" versions="V20_6_5_0_DEM">
         <add name="Bone Indices" type="int" arr1="3" />
         <add name="Weights" type="float" arr1="3" />
     </compound>
 
-    <compound name="PartitionDataEpicMickey" versions="V20_6_5_0_DEM">
+    <compound name="PartitionDataEpicMickey" size="28" versions="V20_6_5_0_DEM">
         <add name="Start" type="int" />
         <add name="End" type="int" />
         <add name="Weight Indices" type="ushort" arr1="10" />
@@ -6577,7 +6577,7 @@
         <add name="Target Names" type="string" arr1="Num Targets" />
     </niobject>
 
-    <compound name="ElementReference" since="V20_5_0_0">
+    <compound name="ElementReference" size="12" since="V20_5_0_0">
         <add name="Semantic" type="SemanticData">The element semantic.</add>
         <add name="Normalize Flag" type="uint">Whether or not to normalize the data.</add>
     </compound>
@@ -6648,7 +6648,7 @@
 
     <!-- NiPS Particle System -->
 
-    <compound name="PSSpawnRateKey" since="V20_5_0_0">
+    <compound name="PSSpawnRateKey" size="8" since="V20_5_0_0">
         <add name="Value" type="float" />
         <add name="Time" type="float" />
     </compound>
@@ -7478,7 +7478,7 @@
         <add name="LOD2 Size" type="uint" />
     </niobject>
     
-    <compound name="BSGeometryPerSegmentSharedData" versions="#FO4#">
+    <compound name="BSGeometryPerSegmentSharedData" size="16" versions="#FO4#">
         <add name="User Index" type="uint">If Bone ID is 0xffffffff, this value refers to the Segment at the listed index. Otherwise this is the "Biped Object", which is like the body part types in Skyrim and earlier.</add>
         <add name="Bone ID" type="uint">A hash of the bone name string.</add>
         <add name="Num Cut Offsets" type="uint">Maximum of 8.</add>
@@ -7543,7 +7543,7 @@
     
     <!-- Fallout 4 Skeleton -->
 
-    <compound name="BSSkinBoneTrans" versions="#FO4#">
+    <compound name="BSSkinBoneTrans" size="68" versions="#FO4#">
         Fallout 4 Bone Transform
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Rotation" type="Matrix33" />
@@ -7600,7 +7600,7 @@
         <add name="Data" type="float" arr1="Num Data" />
     </niobject>
 	
-    <compound name="BSPackedGeomDataCombined" versions="#FO4#">
+    <compound name="BSPackedGeomDataCombined" size="72" versions="#FO4#">
         <add name="Grayscale to Palette Scale" type="float" />
         <add name="Transform" type="NiTransform" />
         <add name="Bounding Sphere" type="NiBound" />
@@ -7636,7 +7636,7 @@
         <add name="Vertex Desc" type="BSVertexDesc" />
     </compound>
 
-    <compound name="BSPackedGeomObject" versions="#FO4#">
+    <compound name="BSPackedGeomObject" size="8" versions="#FO4#">
         This appears to be a 64-bit hash but nif.xml does not have a 64-bit type.
         <add name="Shape ID 1" type="uint" />
         <add name="Shape ID 2" type="uint" />

From f023ad3620e19f5a293cd3056493cb61fd815308 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 5 Jun 2018 10:04:26 -0400
Subject: [PATCH 35/86] Add versions to a few Bethesda-only compounds

Follow-up to fd66c97 for #70
---
 nif.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nif.xml b/nif.xml
index 2a08d0e..ab5d4c0 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2179,13 +2179,13 @@
         <add name="Scale" type="Vector3" />
     </compound>
 
-    <compound name="BonePose">
+    <compound name="BonePose" versions="#FO3_AND_LATER#">
         A list of transforms for each bone in bhkPoseArray.
         <add name="Num Transforms" type="uint" />
         <add name="Transforms" type="BoneTransform" arr1="Num Transforms" />
     </compound>
 
-    <compound name="DecalVectorArray">
+    <compound name="DecalVectorArray" versions="#FO3_AND_LATER#">
         Array of Vectors for Decal placement in BSDecalPlacementVectorExtraData.
         <add name="Num Vectors" type="short" />
         <add name="Points" type="Vector3" arr1="Num Vectors">Vector XYZ coords</add>
@@ -2204,7 +2204,7 @@
         <add name="Body Part" type="BSDismemberBodyPartType">Body Part Index</add>
     </compound>
     
-    <compound name="BoneLOD" size="8">
+    <compound name="BoneLOD" size="8" versions="#SKY_AND_LATER#">
         Stores Bone Level of Detail info in a BSBoneLODExtraData
         <add name="Distance" type="uint" />
         <add name="Bone Name" type="string" />

From 29d0245270bf45b1279156251901363217de5247 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Wed, 6 Jun 2018 02:14:55 -0400
Subject: [PATCH 36/86] Remove `arr3` from legacy object

Was completely unsupported and undocumented and unused by any software.  Replaced with arithmetic even though the decoding is likely wrong anyway.

For #76
---
 nif.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nif.xml b/nif.xml
index ab5d4c0..8e3d431 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2296,7 +2296,7 @@
         <add name="Parent" type="Ref" template="NiObject" />
         <add name="Num 1" type="uint" />
         <add name="Num 2" type="uint" />
-        <add name="Unknown 2" type="uint" arr1="Num 1" arr2="Num 2" arr3="2" />
+        <add name="Unknown 2" type="uint" arr1="Num 1 * Num 2" arr2="2" />
     </niobject>
 
     <niobject name="Ni3dsAnimationNode" inherit="NiObject" versions="V2_3">

From 4970fcbaa2847e7398764e1b6a687ed89f7d56ca Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Wed, 6 Jun 2018 04:38:34 -0400
Subject: [PATCH 37/86] Replaced global tokens and XML entity operators

For #70

Have not decided on the non-escaped entities such as `==`, `|`, `||`, etc. yet, as at least `==` is much more readable than `#EQ#`.

Replaced all Version, User Version, etc. with their global tokens.

Also cleaned up NiTexturingProperty in the process.
---
 nif.xml | 270 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 134 insertions(+), 136 deletions(-)

diff --git a/nif.xml b/nif.xml
index 8e3d431..61afd03 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1724,38 +1724,38 @@
 	</bitflags>
     
 	<compound name="BSVertexData" versions="#SSE# #FO4#">
-		<add name="Vertex" type="Vector3" cond="(ARG &amp; 0x4010) == 0x4010" />
-		<add name="Bitangent X" type="float" cond="(ARG &amp; 0x4110) == 0x4110" />
-		<add name="Unknown Int" type="uint" cond="(ARG &amp; 0x4110) == 0x4010" />
-
-		<add name="Vertex" type="HalfVector3" cond="(ARG &amp; 0x4010) == 0x10" />
-		<add name="Bitangent X" type="hfloat" cond="(ARG &amp; 0x4110) == 0x110" />
-		<add name="Unknown Short" type="ushort" cond="(ARG &amp; 0x4110) == 0x10" />
-
-		<add name="UV" type="HalfTexCoord" cond="ARG &amp; 0x20" />
-		<add name="Normal" type="ByteVector3" cond="ARG &amp; 0x80" />
-		<add name="Bitangent Y" type="byte" cond="ARG &amp; 0x80" />
-		<add name="Tangent" type="ByteVector3" cond="(ARG &amp; 0x180) == 0x180" />
-		<add name="Bitangent Z" type="byte" cond="(ARG &amp; 0x180) == 0x180" />
-		<add name="Vertex Colors" type="ByteColor4" cond="ARG &amp; 0x200" />
-		<add name="Bone Weights" type="hfloat" arr1="4" cond="ARG &amp; 0x400" />
-		<add name="Bone Indices" type="byte" arr1="4" cond="ARG &amp; 0x400" />
-		<add name="Eye Data" type="float" cond="ARG &amp; 0x1000" />
+		<add name="Vertex" type="Vector3" cond="(ARG #BITAND# 0x4010) == 0x4010" />
+		<add name="Bitangent X" type="float" cond="(ARG #BITAND# 0x4110) == 0x4110" />
+		<add name="Unknown Int" type="uint" cond="(ARG #BITAND# 0x4110) == 0x4010" />
+
+		<add name="Vertex" type="HalfVector3" cond="(ARG #BITAND# 0x4010) == 0x10" />
+		<add name="Bitangent X" type="hfloat" cond="(ARG #BITAND# 0x4110) == 0x110" />
+		<add name="Unknown Short" type="ushort" cond="(ARG #BITAND# 0x4110) == 0x10" />
+
+		<add name="UV" type="HalfTexCoord" cond="ARG #BITAND# 0x20" />
+		<add name="Normal" type="ByteVector3" cond="ARG #BITAND# 0x80" />
+		<add name="Bitangent Y" type="byte" cond="ARG #BITAND# 0x80" />
+		<add name="Tangent" type="ByteVector3" cond="(ARG #BITAND# 0x180) == 0x180" />
+		<add name="Bitangent Z" type="byte" cond="(ARG #BITAND# 0x180) == 0x180" />
+		<add name="Vertex Colors" type="ByteColor4" cond="ARG #BITAND# 0x200" />
+		<add name="Bone Weights" type="hfloat" arr1="4" cond="ARG #BITAND# 0x400" />
+		<add name="Bone Indices" type="byte" arr1="4" cond="ARG #BITAND# 0x400" />
+		<add name="Eye Data" type="float" cond="ARG #BITAND# 0x1000" />
 	</compound>
 
 	<compound name="BSVertexDataSSE" versions="#SSE# #FO4#">
-		<add name="Vertex" type="Vector3" cond="ARG &amp; 0x10" />
-		<add name="Bitangent X" type="float" cond="(ARG &amp; 0x110) == 0x110" />
-		<add name="Unknown Int" type="int" cond="(ARG &amp; 0x110) == 0x10" />
-		<add name="UV" type="HalfTexCoord" cond="ARG &amp; 0x20" />
-		<add name="Normal" type="ByteVector3" cond="ARG &amp; 0x80" />
-		<add name="Bitangent Y" type="byte" cond="ARG &amp; 0x80" />
-		<add name="Tangent" type="ByteVector3" cond="(ARG &amp; 0x180) == 0x180" />
-		<add name="Bitangent Z" type="byte" cond="(ARG &amp; 0x180) == 0x180" />
-		<add name="Vertex Colors" type="ByteColor4" cond="ARG &amp; 0x200" />
-		<add name="Bone Weights" type="hfloat" arr1="4" cond="ARG &amp; 0x400" />
-		<add name="Bone Indices" type="byte" arr1="4" cond="ARG &amp; 0x400" />
-		<add name="Eye Data" type="float" cond="ARG &amp; 0x1000" />
+		<add name="Vertex" type="Vector3" cond="ARG #BITAND# 0x10" />
+		<add name="Bitangent X" type="float" cond="(ARG #BITAND# 0x110) == 0x110" />
+		<add name="Unknown Int" type="int" cond="(ARG #BITAND# 0x110) == 0x10" />
+		<add name="UV" type="HalfTexCoord" cond="ARG #BITAND# 0x20" />
+		<add name="Normal" type="ByteVector3" cond="ARG #BITAND# 0x80" />
+		<add name="Bitangent Y" type="byte" cond="ARG #BITAND# 0x80" />
+		<add name="Tangent" type="ByteVector3" cond="(ARG #BITAND# 0x180) == 0x180" />
+		<add name="Bitangent Z" type="byte" cond="(ARG #BITAND# 0x180) == 0x180" />
+		<add name="Vertex Colors" type="ByteColor4" cond="ARG #BITAND# 0x200" />
+		<add name="Bone Weights" type="hfloat" arr1="4" cond="ARG #BITAND# 0x400" />
+		<add name="Bone Indices" type="byte" arr1="4" cond="ARG #BITAND# 0x400" />
+		<add name="Eye Data" type="float" cond="ARG #BITAND# 0x1000" />
 	</compound>
 
     <compound name="BSVertexDesc" size="8" versions="#SSE# #FO4#">
@@ -1785,9 +1785,9 @@
         <add name="Strip Lengths" type="ushort" arr1="Num Strips">The strip lengths.</add>
         <add name="Has Faces" type="bool" ver1="10.1.0.0">Do we have triangle or strip data?</add>
         <add name="Strips" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="Num Strips != 0" ver2="10.0.1.2">The strips.</add>
-        <add name="Strips" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="(Has Faces) &amp;&amp; (Num Strips != 0)" ver1="10.1.0.0">The strips.</add>
+        <add name="Strips" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="(Has Faces) #AND# (Num Strips != 0)" ver1="10.1.0.0">The strips.</add>
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Num Strips == 0" ver2="10.0.1.2">The triangles.</add>
-        <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="(Has Faces) &amp;&amp; (Num Strips == 0)" ver1="10.1.0.0">The triangles.</add>
+        <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="(Has Faces) #AND# (Num Strips == 0)" ver1="10.1.0.0">The triangles.</add>
         <add name="Has Bone Indices" type="bool">Do we have bone indices?</add>
         <add name="Bone Indices" type="byte" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Bone Indices">Bone indices, they index into 'Bones'.</add>
 		<add name="Unknown Short" type="ushort" vercond="#BS_GT_FO3#" />
@@ -1870,7 +1870,7 @@
         <add name="Num Keys" type="uint" ver2="10.1.0.0">The number of morph keys that follow.</add>
         <add name="Interpolation" type="KeyType" ver2="10.1.0.0">Unlike most objects, the presense of this value is not conditional on there being keys.</add>
         <add name="Keys" type="Key" arg="Interpolation" template="float" arr1="Num Keys" ver2="10.1.0.0">The morph key frames.</add>
-        <add name="Legacy Weight" type="float" ver1="10.1.0.104" ver2="20.1.0.2" vercond="User Version 2 &lt; 10" /> <!-- Exclude Bethesda -->
+        <add name="Legacy Weight" type="float" ver1="10.1.0.104" ver2="20.1.0.2" vercond="#BSVER# #LT# 10" /> <!-- Exclude Bethesda -->
         <add name="Vectors" type="Vector3" arr1="ARG">Morph vectors.</add>
     </compound>
 
@@ -1896,9 +1896,9 @@
 
     <compound name="HavokFilter" size="4" versions="#BETHESDA#">
         Bethesda Havok. Collision filter info representing Layer, Flags, Part Number, and Group all combined into one uint.
-        <add name="Layer" suffix="OB" type="OblivionLayer" default="OL_STATIC" ver2="20.0.0.5" vercond="(User Version 2 &lt; 16)">The layer the collision belongs to.</add>
-        <add name="Layer" suffix="FO" type="Fallout3Layer" default="FOL_STATIC" vercond="(Version == 20.2.0.7) &amp;&amp; #NI_BS_LTE_FO3#">The layer the collision belongs to.</add>
-        <add name="Layer" suffix="SK" type="SkyrimLayer" default="SKYL_STATIC" vercond="(Version == 20.2.0.7) &amp;&amp; #BS_GT_FO3#">The layer the collision belongs to.</add>
+        <add name="Layer" suffix="OB" type="OblivionLayer" default="OL_STATIC" ver2="20.0.0.5" vercond="#BSVER# #LT# 16">The layer the collision belongs to.</add>
+        <add name="Layer" suffix="FO" type="Fallout3Layer" default="FOL_STATIC" vercond="(#VER# == 20.2.0.7) #AND# #NI_BS_LTE_FO3#">The layer the collision belongs to.</add>
+        <add name="Layer" suffix="SK" type="SkyrimLayer" default="SKYL_STATIC" vercond="(#VER# == 20.2.0.7) #AND# #BS_GT_FO3#">The layer the collision belongs to.</add>
 
         <add name="Flags and Part Number" type="byte" default="0">FLAGS are stored in highest 3 bits:
         	Bit 7: sets the LINK property and controls whether this body is physically linked to others.
@@ -1945,9 +1945,9 @@
     <compound name="HavokMaterial" versions="#BETHESDA#">
         Bethesda Havok. Material wrapper for varying material enums by game.
         <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
-        <add name="Material" suffix="OB" type="OblivionHavokMaterial" ver2="20.0.0.5" vercond="(User Version 2 &lt; 16)">The material of the shape.</add>
-        <add name="Material" suffix="FO" type="Fallout3HavokMaterial" vercond="(Version == 20.2.0.7) &amp;&amp; #NI_BS_LTE_FO3#">The material of the shape.</add>
-        <add name="Material" suffix="SK" type="SkyrimHavokMaterial" vercond="(Version == 20.2.0.7) &amp;&amp; #BS_GT_FO3#">The material of the shape.</add>
+        <add name="Material" suffix="OB" type="OblivionHavokMaterial" ver2="20.0.0.5" vercond="#BSVER# #LT# 16">The material of the shape.</add>
+        <add name="Material" suffix="FO" type="Fallout3HavokMaterial" vercond="(#VER# == 20.2.0.7) #AND# #NI_BS_LTE_FO3#">The material of the shape.</add>
+        <add name="Material" suffix="SK" type="SkyrimHavokMaterial" vercond="(#VER# == 20.2.0.7) #AND# #BS_GT_FO3#">The material of the shape.</add>
     </compound>
 
     <compound name="OblivionSubShape" versions="#BETHESDA#">
@@ -2424,7 +2424,7 @@
         <add name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</add>
         <add name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</add>
         <add name="Time Factor" type="float" default="1.0" vercond="#BS_GT_FO3#" />
-        <add name="Gravity Factor" type="float" default="1.0" vercond="#BS_GT_FO3# &amp;&amp; (!#BS_FO4#)" />
+        <add name="Gravity Factor" type="float" default="1.0" vercond="#BS_GT_FO3# #AND# (!#BS_FO4#)" />
         <add name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</add>
         <add name="Rolling Friction Multiplier" type="float" vercond="#BS_GT_FO3#" />
         <add name="Restitution" type="float" default="0.4">
@@ -2453,8 +2453,8 @@
         <add name="Unknown Bytes 2" type="byte" arr1="4" vercond="#BS_GT_FO3#" />
         <add name="Num Constraints" type="uint" />
         <add name="Constraints" type="Ref" template="bhkSerializable" arr1="Num Constraints" />
-        <add name="Body Flags" type="uint" vercond="(User Version 2 &lt; 76)">1 = respond to wind</add>
-        <add name="Body Flags" type="ushort" vercond="(User Version 2 &gt;= 76)">1 = respond to wind</add>
+        <add name="Body Flags" type="uint" vercond="#BSVER# #LT# 76">1 = respond to wind</add>
+        <add name="Body Flags" type="ushort" vercond="#BSVER# #GTE# 76">1 = respond to wind</add>
     </niobject>
 
     <niobject name="bhkRigidBodyT" inherit="bhkRigidBody" versions="#BETHESDA#">
@@ -2779,15 +2779,15 @@
         <add name="Array Size" type="byte" ver1="10.1.0.110" />
         <add name="Weight Threshold" type="float" ver1="10.1.0.112" />
         <!-- Flags conds -->
-        <add name="Interp Count" type="byte" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="Single Index" type="byte" default="255" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="High Priority" type="char" default="-128" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="Next High Priority" type="char" default="-128" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="Single Time" type="float" default="#FLT_MIN#" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="High Weights Sum" type="float" default="#FLT_MIN#" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="Next High Weights Sum" type="float" default="#FLT_MIN#" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="High Ease Spinner" type="float" default="#FLT_MIN#" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
-        <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" cond="(Flags &amp; 1) == 0" ver1="10.1.0.112" />
+        <add name="Interp Count" type="byte" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="Single Index" type="byte" default="255" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="High Priority" type="char" default="-128" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="Next High Priority" type="char" default="-128" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="Single Time" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="High Weights Sum" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="Next High Weights Sum" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="High Ease Spinner" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
         <!-- end Flags 1 conds -->
         <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" ver2="10.1.0.111" />
         <add name="Managed Controlled" type="bool" ver2="10.1.0.111" />
@@ -2881,8 +2881,8 @@
         Unknown.
         <add name="Heir Gain" type="float" />
         <add name="Vel Gain" type="float" />
-        <add name="Unknown Float 1" type="float" vercond="User Version 2 &lt; 9" />
-        <add name="Unknown Float 2" type="float" vercond="User Version 2 &lt; 9" />
+        <add name="Unknown Float 1" type="float" vercond="#BSVER# #LT# 9" />
+        <add name="Unknown Float 2" type="float" vercond="#BSVER# #LT# 9" />
     </niobject>
 
     <niobject name="bhkPCollisionObject" inherit="bhkNiCollisionObject">
@@ -2895,8 +2895,8 @@
 
     <niobject name="NiAVObject" abstract="1" inherit="NiObjectNET">
         Abstract audio-visual base class from which all of Gamebryo's scene graph objects inherit.
-        <add name="Flags" type="uint" default="14" vercond="(User Version 2 &gt; 26)">Basic flags for AV objects. For Bethesda streams above 26 only.</add>
-        <add name="Flags" type="Flags" ver1="3.0" vercond="(User Version 2 &lt;= 26)">Basic flags for AV objects; commonly 0x000C or 0x000A.</add>
+        <add name="Flags" type="uint" default="14" vercond="#BSVER# #GT# 26">Basic flags for AV objects. For Bethesda streams above 26 only.</add>
+        <add name="Flags" type="Flags" ver1="3.0" vercond="#BSVER# #LTE# 26">Basic flags for AV objects; commonly 0x000C or 0x000A.</add>
         <add name="Translation" type="Vector3">The translation vector.</add>
         <add name="Rotation" type="Matrix33">The rotation part of the transformation matrix.</add>
         <add name="Scale" type="float" default="1.0">Scaling part (only uniform scaling is supported).</add>
@@ -3008,8 +3008,8 @@
         <add name="Num Interpolators" type="uint" ver1="10.1.0.106" />
         <add name="Interpolators" type="Ref" template="NiInterpolator" arr1="Num Interpolators" ver1="10.1.0.106" ver2="20.0.0.5" />
         <add name="Interpolator Weights" type="MorphWeight" arr1="Num Interpolators" ver1="20.1.0.3" />
-        <add name="Num Unknown Ints" type="uint" ver1="10.2.0.0" ver2="20.0.0.5" vercond="(User Version 2 &gt; 9)" />
-        <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" ver1="10.2.0.0" ver2="20.0.0.5" vercond="(User Version 2 &gt; 9)" />
+        <add name="Num Unknown Ints" type="uint" ver1="10.2.0.0" ver2="20.0.0.5" vercond="#BSVER# #GT# 9" />
+        <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" ver1="10.2.0.0" ver2="20.0.0.5" vercond="#BSVER# #GT# 9" />
     </niobject>
 
     <niobject name="NiMorphController" inherit="NiInterpController">
@@ -3224,7 +3224,7 @@
         <add name="Material Extra Data" type="int" arr1="Num Materials" ver1="20.2.0.5">Extra data associated with the material. A value of -1 means the material is the default implementation.</add>
         <add name="Active Material" type="int" default="-1" ver1="20.2.0.5">The index of the currently active material.</add>
         <!-- Custom Versions -->
-        <add name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" vercond="(User Version == 1)">Cyanide extension (Blood Bowl).</add>
+        <add name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" vercond="#USER# == 1">Cyanide extension (Blood Bowl).</add>
         <add name="WorldShift Unknown" type="int" ver1="10.3.0.1" ver2="10.4.0.1" />
         <!-- / Custom -->
         <add name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</add>
@@ -3312,8 +3312,8 @@
         <add name="Material CRC" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
         <add name="Has Normals" type="bool">Do we have lighting normals? These are essential for proper lighting: if not present, the model will only be influenced by ambient light.</add>
         <add name="Normals" type="Vector3" arr1="Num Vertices" cond="Has Normals">The lighting normals.</add>
-        <add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Tangent vectors.</add>
-        <add name="Bitangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) &amp;&amp; ((Vector Flags | BS Vector Flags) &amp; 4096)" ver1="10.1.0.0">Bitangent vectors.</add>
+        <add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) #AND# ((Vector Flags | BS Vector Flags) #BITAND# 4096)" ver1="10.1.0.0">Tangent vectors.</add>
+        <add name="Bitangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) #AND# ((Vector Flags | BS Vector Flags) #BITAND# 4096)" ver1="10.1.0.0">Bitangent vectors.</add>
         <add name="Has DIV2 Floats" type="bool" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
         <add name="DIV2 Floats" type="float" arr1="Num Vertices" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" cond="Has DIV2 Floats" />
         <add name="Bounding Sphere" type="NiBound" />
@@ -3331,7 +3331,7 @@
 
             Note: for compatibility with NifTexture, set this value to either 0x00000000 or 0xFFFFFFFF.
         </add>
-        <add name="UV Sets" type="TexCoord" arr1="((Num UV Sets &amp; 63) | (Vector Flags &amp; 63) | (BS Vector Flags &amp; 1))" arr2="Num Vertices">The UV texture coordinates. They follow the OpenGL standard: some programs may require you to flip the second coordinate.</add>
+        <add name="UV Sets" type="TexCoord" arr1="((Num UV Sets #BITAND# 63) | (Vector Flags #BITAND# 63) | (BS Vector Flags #BITAND# 1))" arr2="Num Vertices">The UV texture coordinates. They follow the OpenGL standard: some programs may require you to flip the second coordinate.</add>
         <add name="Consistency Flags" type="ConsistencyType" ver1="10.0.1.0" default="CT_MUTABLE">Consistency Flags</add>
         <add name="Additional Data" type="Ref" template="AbstractAdditionalGeometryData" ver1="20.0.0.4" />
     </niobject>
@@ -3430,9 +3430,7 @@
 
     <niobject name="NiParticlesData" inherit="NiGeometryData">
         Generic rotating particles data object.
-        <!-- Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly. 
-            `!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))` means "Not Bethesda 20.2"
-        -->
+        Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly.
         <add name="Num Particles" type="ushort" ver2="4.0.0.2">The maximum number of particles (matches the number of vertices).</add>
         <add name="Particle Radius" type="float" ver2="10.0.1.0">The particles' size.</add>
         <add name="Has Radii" type="bool" ver1="10.1.0.0">Is the particle size array present?</add>
@@ -3480,7 +3478,6 @@
 
     <niobject name="NiPSysData" inherit="NiParticlesData">
         Particle system data.
-        <!-- `!((Version == 20.2.0.7) &amp;&amp; (User Version 2 &gt; 0))` means "Not Bethesda 20.2" -->
         <add name="Particle Descriptions" type="ParticleDesc" arr1="Num Vertices" vercond="!#BS202#" />
         <add name="Has Rotation Speeds" type="bool" ver1="20.0.0.2" />
         <add name="Rotation Speeds" type="float" arr1="Num Vertices" cond="Has Rotation Speeds" ver1="20.0.0.2" vercond="!#BS202#" />
@@ -3677,9 +3674,9 @@
         <add name="Accum Flags" type="AccumFlags" ver1="20.3.0.8" default="ACCUM_X_FRONT" />
         <add name="String Palette" type="Ref" template="NiStringPalette" ver1="10.1.0.113" ver2="20.1.0.0" />
         <!-- Bethesda -->
-        <add name="Anim Notes" type="Ref" template="BSAnimNotes" ver1="20.2.0.7" vercond="(User Version 2 &gt;= 24) &amp;&amp; (User Version 2 &lt;= 28)" />
-        <add name="Num Anim Note Arrays" type="ushort" ver1="20.2.0.7" vercond="(User Version 2 &gt; 28)" />
-        <add name="Anim Note Arrays" type="Ref" template="BSAnimNotes" arr1="Num Anim Note Arrays" ver1="20.2.0.7" vercond="(User Version 2 &gt; 28)" />
+        <add name="Anim Notes" type="Ref" template="BSAnimNotes" ver1="20.2.0.7" vercond="(#BSVER# #GTE# 24) #AND# (#BSVER# #LTE# 28)" />
+        <add name="Num Anim Note Arrays" type="ushort" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
+        <add name="Anim Note Arrays" type="Ref" template="BSAnimNotes" arr1="Num Anim Note Arrays" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
     </niobject>
 
     <niobject name="NiAVObjectPalette" abstract="1" inherit="NiObject">
@@ -3818,13 +3815,13 @@
     <niobject name="NiMaterialProperty" inherit="NiProperty">
         Describes the surface properties of an object e.g. translucency, ambient color, diffuse color, emissive color, and specular color.
         <add name="Flags" type="Flags" ver1="3.0" ver2="10.0.1.2">Property flags.</add>
-        <add name="Ambient Color" type="Color3" default="#VEC3_ONE#" vercond="(User Version 2 &lt; 26)">How much the material reflects ambient light.</add>
-        <add name="Diffuse Color" type="Color3" default="#VEC3_ONE#" vercond="(User Version 2 &lt; 26)">How much the material reflects diffuse light.</add>
+        <add name="Ambient Color" type="Color3" default="#VEC3_ONE#" vercond="#BSVER# #LT# 26">How much the material reflects ambient light.</add>
+        <add name="Diffuse Color" type="Color3" default="#VEC3_ONE#" vercond="#BSVER# #LT# 26">How much the material reflects diffuse light.</add>
         <add name="Specular Color" type="Color3" default="#VEC3_ONE#">How much light the material reflects in a specular manner.</add>
         <add name="Emissive Color" type="Color3" default="#VEC3_ZERO#">How much light the material emits.</add>
         <add name="Glossiness" type="float" default="10.0">The material glossiness.</add>
         <add name="Alpha" type="float" default="1.0">The material transparency (1=non-transparant). Refer to a NiAlphaProperty object in this material's parent NiTriShape object, when alpha is not 1.</add>
-        <add name="Emissive Mult" type="float" default="1.0" vercond="(User Version 2 &gt; 21)" />
+        <add name="Emissive Mult" type="float" default="1.0" vercond="#BSVER# #GT# 21" />
     </niobject>
 
     <niobject name="NiMorphData" inherit="NiObject">
@@ -4557,7 +4554,7 @@
 		<add name="Data Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Vertex Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
-		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" arr1="Data Size / Vertex Size" cond="Data Size &gt; 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" arr1="Data Size / Vertex Size" cond="Data Size #GT# 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
     </niobject>
 
@@ -4705,40 +4702,41 @@
         <add name="Flags" type="Flags" ver1="20.1.0.2">Property flags.</add>
         <add name="Apply Mode" type="ApplyMode" default="APPLY_MODULATE" ver1="3.3.0.13" ver2="20.1.0.1">Determines how the texture will be applied.  Seems to have special functions in Oblivion.</add>
         <add name="Texture Count" type="uint" default="7">Number of textures.</add>
-        <add name="Has Base Texture" type="bool">Do we have a base texture?</add>
-        <add name="Base Texture" type="TexDesc" cond="Has Base Texture">The base texture.</add>
-        <add name="Has Dark Texture" type="bool">Do we have a dark texture?</add>
-        <add name="Dark Texture" type="TexDesc" cond="Has Dark Texture">The dark texture.</add>
-        <add name="Has Detail Texture" type="bool">Do we have a detail texture?</add>
-        <add name="Detail Texture" type="TexDesc" cond="Has Detail Texture">The detail texture.</add>
-        <add name="Has Gloss Texture" type="bool">Do we have a gloss texture?</add>
-        <add name="Gloss Texture" type="TexDesc" cond="Has Gloss Texture">The gloss texture.</add>
-        <add name="Has Glow Texture" type="bool">Do we have a glow texture?</add>
-        <add name="Glow Texture" type="TexDesc" cond="Has Glow Texture">The glowing texture.</add>
-        <add name="Has Bump Map Texture" type="bool" ver1="3.3.0.13" cond="Texture Count &gt; 5">Do we have a bump map texture?</add>
-        <add name="Bump Map Texture" type="TexDesc" cond="Has Bump Map Texture">The bump map texture.</add>
-        <add name="Bump Map Luma Scale" type="float" cond="Has Bump Map Texture" />
-        <add name="Bump Map Luma Offset" type="float" cond="Has Bump Map Texture" />
-        <add name="Bump Map Matrix" type="Matrix22" cond="Has Bump Map Texture" />
-        <add name="Has Normal Texture" type="bool" cond="Texture Count &gt; 6" ver1="20.2.0.5">Do we have a normal texture?</add>
-        <add name="Normal Texture" type="TexDesc" cond="Has Normal Texture">Normal texture.</add>
-        <add name="Has Parallax Texture" type="bool" cond="Texture Count &gt; 7" ver1="20.2.0.5" />
-        <add name="Parallax Texture" type="TexDesc" cond="Has Parallax Texture" />
-        <add name="Parallax Offset" type="float" cond="Has Parallax Texture" />
-        <add name="Has Decal 0 Texture" type="bool" cond="Texture Count &gt; 6" ver2="20.2.0.4">Do we have a decal 0 texture?</add>
-        <add name="Has Decal 0 Texture" type="bool" cond="Texture Count &gt; 8" ver1="20.2.0.5">Do we have a decal 0 texture?</add>
-        <add name="Decal 0 Texture" type="TexDesc" cond="Has Decal 0 Texture">The decal texture.</add>
-        <add name="Has Decal 1 Texture" type="bool" cond="Texture Count &gt; 7" ver2="20.2.0.4">Do we have a decal 1 texture?</add>
-        <add name="Has Decal 1 Texture" type="bool" cond="Texture Count &gt; 9" ver1="20.2.0.5">Do we have a decal 1 texture?</add>
-        <add name="Decal 1 Texture" type="TexDesc" cond="Has Decal 1 Texture">Another decal texture.</add>
-        <add name="Has Decal 2 Texture" type="bool" cond="Texture Count &gt; 8" ver2="20.2.0.4">Do we have a decal 2 texture?</add>
-        <add name="Has Decal 2 Texture" type="bool" cond="Texture Count &gt; 10" ver1="20.2.0.5">Do we have a decal 2 texture?</add>
-        <add name="Decal 2 Texture" type="TexDesc" cond="Has Decal 2 Texture">Another decal texture.</add>
-        <add name="Has Decal 3 Texture" type="bool" cond="Texture Count &gt; 9" ver2="20.2.0.4">Do we have a decal 3 texture?</add>
-        <add name="Has Decal 3 Texture" type="bool" cond="Texture Count &gt; 11" ver1="20.2.0.5">Do we have a decal 3 texture?</add>
-        <add name="Decal 3 Texture" type="TexDesc" cond="Has Decal 3 Texture">Another decal texture. Who knows the limit.</add>
-        <add name="Num Shader Textures" type="uint" ver1="10.0.1.0">Number of Shader textures that follow.</add>
-        <add name="Shader Textures" type="ShaderTexDesc" arr1="Num Shader Textures" ver1="10.0.1.0">Shader textures.</add>
+        <add name="Has Base Texture" type="bool" />
+        <add name="Base Texture" type="TexDesc" cond="Has Base Texture" />
+        <add name="Has Dark Texture" type="bool" />
+        <add name="Dark Texture" type="TexDesc" cond="Has Dark Texture" />
+        <add name="Has Detail Texture" type="bool" />
+        <add name="Detail Texture" type="TexDesc" cond="Has Detail Texture" />
+        <add name="Has Gloss Texture" type="bool" />
+        <add name="Gloss Texture" type="TexDesc" cond="Has Gloss Texture" />
+        <add name="Has Glow Texture" type="bool" />
+        <add name="Glow Texture" type="TexDesc" cond="Has Glow Texture" />
+        <add name="Has Bump Map Texture" type="bool" ver1="3.3.0.13" cond="Texture Count #GT# 5" />
+        <add name="Bump Map Texture" type="TexDesc" ver1="3.3.0.13" cond="Has Bump Map Texture" />
+        <add name="Bump Map Luma Scale" type="float" ver1="3.3.0.13" cond="Has Bump Map Texture" />
+        <add name="Bump Map Luma Offset" type="float" ver1="3.3.0.13" cond="Has Bump Map Texture" />
+        <add name="Bump Map Matrix" type="Matrix22" ver1="3.3.0.13" cond="Has Bump Map Texture" />
+        <add name="Has Normal Texture" type="bool" cond="Texture Count #GT# 6" ver1="20.2.0.5" />
+        <add name="Normal Texture" type="TexDesc" cond="Has Normal Texture" ver1="20.2.0.5" />
+        <add name="Has Parallax Texture" type="bool" cond="Texture Count #GT# 7" ver1="20.2.0.5" />
+        <add name="Parallax Texture" type="TexDesc" cond="Has Parallax Texture" ver1="20.2.0.5" />
+        <add name="Parallax Offset" type="float" cond="Has Parallax Texture" ver1="20.2.0.5" />
+        <add name="Has Decal 0 Texture" type="bool" cond="Texture Count #GT# 6" ver2="20.2.0.4" />
+        <add name="Has Decal 0 Texture" type="bool" cond="Texture Count #GT# 8" ver1="20.2.0.5" />
+        <add name="Decal 0 Texture" type="TexDesc" cond="Has Decal 0 Texture" />
+        <add name="Has Decal 1 Texture" type="bool" cond="Texture Count #GT# 7" ver2="20.2.0.4" />
+        <add name="Has Decal 1 Texture" type="bool" cond="Texture Count #GT# 9" ver1="20.2.0.5" />
+        <add name="Decal 1 Texture" type="TexDesc" cond="Has Decal 1 Texture" />
+        <add name="Has Decal 2 Texture" type="bool" cond="Texture Count #GT# 8" ver2="20.2.0.4" />
+        <add name="Has Decal 2 Texture" type="bool" cond="Texture Count #GT# 10" ver1="20.2.0.5" />
+        <add name="Decal 2 Texture" type="TexDesc" cond="Has Decal 2 Texture" />
+        <add name="Has Decal 3 Texture" type="bool" cond="Texture Count #GT# 9" ver2="20.2.0.4" />
+        <add name="Has Decal 3 Texture" type="bool" cond="Texture Count #GT# 11" ver1="20.2.0.5" />
+        <add name="Decal 3 Texture" type="TexDesc" cond="Has Decal 3 Texture" />
+        
+        <add name="Num Shader Textures" type="uint" ver1="10.0.1.0" />
+        <add name="Shader Textures" type="ShaderTexDesc" arr1="Num Shader Textures" ver1="10.0.1.0" />
     </niobject>
 
     <niobject name="NiMultiTextureProperty" inherit="NiTexturingProperty" />
@@ -5575,19 +5573,19 @@
     <niobject name="BSShaderNoLightingProperty" inherit="BSShaderLightingProperty" versions="#FO3#">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">The texture glow map.</add>
-        <add name="Falloff Start Angle" type="float" default="1.0" vercond="(User Version 2 &gt; 26)">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
-        <add name="Falloff Stop Angle" type="float" default="0.0" vercond="(User Version 2 &gt; 26)">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
-        <add name="Falloff Start Opacity" type="float" default="1.0" vercond="(User Version 2 &gt; 26)">Alpha falloff multiplier at start angle</add>
-        <add name="Falloff Stop Opacity" type="float" default="0.0" vercond="(User Version 2 &gt; 26)">Alpha falloff multiplier at end angle</add>
+        <add name="Falloff Start Angle" type="float" default="1.0" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
+        <add name="Falloff Stop Angle" type="float" default="0.0" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
+        <add name="Falloff Start Opacity" type="float" default="1.0" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at start angle</add>
+        <add name="Falloff Stop Opacity" type="float" default="0.0" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at end angle</add>
     </niobject>
 
     <niobject name="BSShaderPPLightingProperty" inherit="BSShaderLightingProperty" versions="#FO3#">
         Bethesda-specific property.
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set</add>
-        <add name="Refraction Strength" type="float" default="0.0" vercond="(User Version 2 &gt; 14)">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
-        <add name="Refraction Fire Period" type="int" default="0" vercond="(User Version 2 &gt; 14)">Rate of texture movement for refraction shader.</add>
-        <add name="Parallax Max Passes" type="float" default="4.0" vercond="(User Version 2 &gt; 24)">The number of passes the parallax shader can apply.</add>
-        <add name="Parallax Scale" type="float" default="1.0" vercond="(User Version 2 &gt; 24)">The strength of the parallax.</add>
+        <add name="Refraction Strength" type="float" default="0.0" vercond="#BSVER# #GT# 14">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
+        <add name="Refraction Fire Period" type="int" default="0" vercond="#BSVER# #GT# 14">Rate of texture movement for refraction shader.</add>
+        <add name="Parallax Max Passes" type="float" default="4.0" vercond="#BSVER# #GT# 24">The number of passes the parallax shader can apply.</add>
+        <add name="Parallax Scale" type="float" default="1.0" vercond="#BSVER# #GT# 24">The strength of the parallax.</add>
         <!-- TODO: Find where this could have even come from as > 34 doesn't exist for this block. -->
         <add name="Emissive Color" type="Color4" vercond="#BS_GT_FO3#">Glow color and alpha</add>
     </niobject>
@@ -6515,7 +6513,7 @@
     <compound name="MeshDataEpicMickey" versions="V20_6_5_0_DEM">
         <add name="Unknown 1" type="int" />
         <add name="Unknown 2" type="int" />
-        <add name="Unknown 3" type="int" vercond="(User Version &gt; 14)" />
+        <add name="Unknown 3" type="int" vercond="#USER# #GT# 14" />
         <add name="Unknown 4" type="int" />
         <add name="Unknown 5" type="float" />
         <add name="Unknown 6" type="int" />
@@ -6544,8 +6542,8 @@
         <add name="Unknown Data Width" type="uint" />
         <add name="Unknown Data" type="Vector3" arr1="Unknown Data Size" arr2="Unknown Data Width" />
         <add name="Unknown Indices" type="ushort" arr1="Unknown Data Size" />
-        <add name="Num Mapped Primitives" type="ushort" vercond="(User Version &lt; 17)">When non-zero, equal to the number of primitives.</add>
-        <add name="Num Mapped Primitives" type="uint" vercond="(User Version == 17)">When non-zero, equal to the number of primitives.</add>
+        <add name="Num Mapped Primitives" type="ushort" vercond="#USER# #LT# 17">When non-zero, equal to the number of primitives.</add>
+        <add name="Num Mapped Primitives" type="uint" vercond="#USER# == 17">When non-zero, equal to the number of primitives.</add>
         <add name="Mapped Primitives" type="byte" arr1="Num Mapped Primitives">Some integer associated with each primitive.</add>
         <add name="Partition Size" type="uint" />
         <add name="Partitions" type="PartitionDataEpicMickey" arr1="Partition Size" />
@@ -6564,8 +6562,8 @@
         <add name="Num Modifiers" type="uint" />
         <add name="Modifiers" type="Ref" template="NiMeshModifier" arr1="Num Modifiers" />
         <!-- Epic Mickey -->
-        <add name="Has Extra EM Data" type="bool" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 9)" />
-        <add name="Extra EM Data" type="ExtraMeshDataEpicMickey" cond="Has Extra EM Data" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 9)" />
+        <add name="Has Extra EM Data" type="bool" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 9" />
+        <add name="Extra EM Data" type="ExtraMeshDataEpicMickey" cond="Has Extra EM Data" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 9" />
     </niobject>
 
     <niobject name="NiMorphWeightsController" inherit="NiInterpController" since="V20_5_0_0">
@@ -6608,7 +6606,7 @@
         <add name="Num Bones" type="uint">The number of bones referenced by this mesh modifier.</add>
         <add name="Bones" type="Ptr" template="NiAVObject" arr1="Num Bones">Pointers to the bone nodes that affect this skin.</add>
         <add name="Bone Transforms" type="NiTransform" arr1="Num Bones">The transforms that go from bind-pose space to bone space.</add>
-        <add name="Bone Bounds" type="NiBound" cond="(Flags &amp; 2)!=0" arr1="Num Bones">The bounds of the bones.  Only stored if the RECOMPUTE_BOUNDS bit is set.</add>
+        <add name="Bone Bounds" type="NiBound" cond="Flags #BITAND# 2" arr1="Num Bones">The bounds of the bones.  Only stored if the RECOMPUTE_BOUNDS bit is set.</add>
     </niobject>
 
     <niobject name="NiMeshHWInstance" inherit="NiAVObject" since="V20_5_0_0">
@@ -6687,8 +6685,8 @@
         <add name="Spawn Rate Keys" type="PSSpawnRateKey" arr1="Num Spawn Rate Keys" ver1="20.6.1.0" />
         <add name="Pre RPI" type="bool" ver1="20.6.1.0" />
         <!-- Epic Mickey -->
-        <add name="DEM Unknown Int" type="uint" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
-        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
+        <add name="DEM Unknown Int" type="uint" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
+        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
     <niobject name="NiPSMeshParticleSystem" inherit="NiPSParticleSystem" since="V20_5_0_0">
@@ -6763,7 +6761,7 @@
         <add name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</add>
         <add name="Shrink Generation" type="ushort">Specifies the particle generation to which the shrink effect should be applied. This is usually the highest supported generation for the particle system, so that particles will shrink immediately before getting killed.</add>
         <!-- Epic Mickey -->
-        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
+        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
     <niobject name="NiPSSimulatorForcesStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
@@ -6867,9 +6865,9 @@
 
     <niobject name="NiPSGravityFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of directional gravity.
-        <add name="DEM Unknown Short" type="ushort" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
+        <add name="DEM Unknown Short" type="ushort" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
         <add name="Direction" type="Vector3" />
-        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
+        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
     <niobject name="NiPSDragFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
@@ -6923,7 +6921,7 @@
     <niobject name="NiPSVolumeEmitter" abstract="1" inherit="NiPSEmitter" since="V20_5_0_0">
         Abstract base class for particle emitters that emit particles from a volume.
         <!-- Epic Mickey -->
-        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="(User Version &gt; 14)" />
+        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
         <add name="Emitter Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
@@ -7462,13 +7460,13 @@
         <add name="Num Triangles" type="ushort" vercond="#NI_BS_LT_FO4#" />
         <add name="Num Vertices" type="ushort" />
         <add name="Data Size" type="uint" />
-        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" vercond="#BS_FO4#" />
-        <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size &gt; 0" vercond="#BS_SSE#" />
-        <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size &gt; 0" />
+        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size #GT# 0" vercond="#BS_FO4#" />
+        <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size #GT# 0" vercond="#BS_SSE#" />
+        <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size #GT# 0" />
         <add name="Particle Data Size" type="uint" vercond="#BS_SSE#" />
-        <add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" vercond="#BS_SSE#" />
-        <add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size &gt; 0" vercond="#BS_SSE#" />
-        <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size &gt; 0" vercond="#BS_SSE#" />
+        <add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
+        <add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
+        <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
     </niobject>
 
     <niobject name="BSMeshLODTriShape" inherit="BSTriShape" versions="#FO4#">
@@ -7497,11 +7495,11 @@
 
     <niobject name="BSSubIndexTriShape" inherit="BSTriShape" versions="#SSE# #FO4#">
         Fallout 4 Sub-Index Tri Shape
-		<add name="Num Primitives" type="uint" vercond="#BS_FO4#" cond="Data Size &gt; 0" />
-		<add name="Num Segments" type="uint" vercond="#BS_FO4#" cond="Data Size &gt; 0" />
-		<add name="Total Segments" type="uint" vercond="#BS_FO4#" cond="Data Size &gt; 0" />
-		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_FO4#" arr1="Num Segments" cond="Data Size &gt; 0" />
-		<add name="Segment Data" type="BSGeometrySegmentSharedData" vercond="#BS_FO4#" cond="(Num Segments &lt; Total Segments) &amp;&amp; (Data Size &gt; 0)" />
+		<add name="Num Primitives" type="uint" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
+		<add name="Num Segments" type="uint" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
+		<add name="Total Segments" type="uint" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
+		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_FO4#" arr1="Num Segments" cond="Data Size #GT# 0" />
+		<add name="Segment Data" type="BSGeometrySegmentSharedData" vercond="#BS_FO4#" cond="(Num Segments #LT# Total Segments) #AND# (Data Size #GT# 0)" />
 		<add name="Num Segments" type="uint" vercond="#BS_SSE#" />
 		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_SSE#" arr1="Num Segments" />
     </niobject>

From bcd94134b5c76d96fbe672f454b58a5b9bb21094 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Wed, 6 Jun 2018 05:25:09 -0400
Subject: [PATCH 38/86] Move and Rename User Version 2, change ExportInfo to
 BSStreamHeader

Now that any usage of `User Version 2` was actually just a `#BSVER#` token, reorganized the header information for Bethesda NIFs into the correct layout, and renamed the member to a more appropriate BS Version.

The global for #BSVER# uses the member of operator `\`, but as it is a token now it is free to be used however one wishes.

I split #BSSTREAMHEADER# into its own token in case the expression is ever reused (it used to be on multiple members before this reorganization).

Also put `Max Filepath` into BSStreamHeader where it belonged.
---
 nif.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/nif.xml b/nif.xml
index 61afd03..bce84cf 100644
--- a/nif.xml
+++ b/nif.xml
@@ -105,6 +105,10 @@
         <verexpr token="#DIVINITY2#" string="((#USER# #EQ# 0x20000) #OR# (#USER# #EQ# 0x30000))">Divinity 2</verexpr>
     </token>
 
+    <token name="condexpr" attrs="cond">
+        <condexpr token="#BSSTREAMHEADER#" string="(Version #EQ# 10.0.1.2) #OR# ((Version #EQ# 20.2.0.7) #OR# (Version #EQ# 20.0.0.5) #OR# ((Version #GTE# 10.1.0.0) #AND# (Version #LTE# 20.0.0.4) #AND# (User Version #LTE# 11))) #AND# (User Version #GTE# 3)" />
+    </token>
+
     <token name="verset" attrs="versions">
         The set of versions that any Basic, Compound, NiObject, Enum, or Bitflags is restricted to.
         <verset token="#BETHESDA#" string="V10_0_1_2 V10_1_0_101 V10_1_0_106 V10_2_0_0__10 V20_0_0_4__10 V20_0_0_4__11 V20_0_0_5_OBL V20_2_0_7__11_1 V20_2_0_7__11_2 V20_2_0_7__11_3 V20_2_0_7__11_4 V20_2_0_7__11_5 V20_2_0_7__11_6 V20_2_0_7__11_7 V20_2_0_7__11_8 V20_2_0_7_FO3 V20_2_0_7_SKY V20_2_0_7_SSE V20_2_0_7_FO4" />
@@ -142,7 +146,7 @@
         NOTE: These must be listed after the above tokens so that they replace last. For example, `verexpr` uses these tokens.
         <global token="#VER#" string="Version" />
         <global token="#USER#" string="User Version" />
-        <global token="#BSVER#" string="User Version 2" />
+        <global token="#BSVER#" string="BS Header\BS Version" />
     </token>
 
     <token name="operator" attrs="cond vercond arr1 arr2 arg">
@@ -1582,11 +1586,13 @@
         <add name="Interpolator ID" type="string" ver1="20.1.0.1">An ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</add>
     </compound>
 
-    <compound name="ExportInfo" versions="#BETHESDA#">
+    <compound name="BSStreamHeader" versions="#BETHESDA#">
     	Information about how the file was exported
+        <add name="BS Version" type="ulittle32" />
         <add name="Author" type="ShortString" />
         <add name="Process Script" type="ShortString" />
         <add name="Export Script" type="ShortString" />
+        <add name="Max Filepath" type="ShortString" cond="BS Version == 130" />
     </compound>
 
     <!-- Don't use vercond in Header, it breaks niflib -->
@@ -1598,11 +1604,7 @@
         <add name="Endian Type" type="EndianType" default="ENDIAN_LITTLE" ver1="20.0.0.3">Determines the endianness of the data in the file.</add>
         <add name="User Version" type="ulittle32" ver1="10.0.1.8">An extra version number, for companies that decide to modify the file format.</add>
         <add name="Num Blocks" type="ulittle32" ver1="3.1.0.1">Number of file objects.</add>
-        <!-- BSStreamHeader -->
-        <add name="User Version 2" type="ulittle32" default="0" cond="(Version == 10.0.1.2) || ((Version == 20.2.0.7) || (Version == 20.0.0.5) || ((Version &gt;= 10.1.0.0) &amp;&amp; (Version &lt;= 20.0.0.4) &amp;&amp; (User Version &lt;= 11))) &amp;&amp; (User Version &gt;= 3)" />
-        <add name="Export Info" type="ExportInfo" cond="(Version == 10.0.1.2) || ((Version == 20.2.0.7) || (Version == 20.0.0.5) || ((Version &gt;= 10.1.0.0) &amp;&amp; (Version &lt;= 20.0.0.4) &amp;&amp; (User Version &lt;= 11))) &amp;&amp; (User Version &gt;= 3)" />
-        <add name="Max Filepath" type="ShortString" cond="(User Version 2 == 130)" />
-        <!-- / BSStreamHeader -->
+        <add name="BS Header" type="BSStreamHeader" cond="#BSSTREAMHEADER#" />
         <add name="Metadata" type="ByteArray" ver1="30.0.0.0" />
         <add name="Num Block Types" type="ushort" ver1="5.0.0.1">Number of object types in this NIF file.</add>
         <add name="Block Types" type="SizedString" arr1="Num Block Types" ver1="5.0.0.1">List of all object types used in this NIF file.</add>

From f23d16faa98790f4914bb8435e87b4eaf5e15386 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 7 Jun 2018 17:31:43 -0400
Subject: [PATCH 39/86] Replace ARG and TEMPLATE

For #70 and #76

Adopting the token syntax of the other tokens, TEMPLATE and ARG can now be treated the same as other tokens and differentiated from regular identifiers in a generic manner.
---
 nif.xml | 80 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/nif.xml b/nif.xml
index bce84cf..170387b 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1633,25 +1633,25 @@
     <compound name="Key" istemplate="1">
         A generic key with support for interpolation. Type 1 is normal linear interpolation, type 2 has forward and backward tangents, and type 3 has tension, bias and continuity arguments. Note that color4 and byte always seem to be of type 1.
         <add name="Time" type="float">Time of the key.</add>
-        <add name="Value" type="TEMPLATE">The key value.</add>
-        <add name="Forward" type="TEMPLATE" cond="ARG == 2">Key forward tangent.</add>
-        <add name="Backward" type="TEMPLATE" cond="ARG == 2">The key backward tangent.</add>
-        <add name="TBC" type="TBC" cond="ARG == 3">The TBC of the key.</add>
+        <add name="Value" type="#T#">The key value.</add>
+        <add name="Forward" type="#T#" cond="#ARG# == 2">Key forward tangent.</add>
+        <add name="Backward" type="#T#" cond="#ARG# == 2">The key backward tangent.</add>
+        <add name="TBC" type="TBC" cond="#ARG# == 3">The TBC of the key.</add>
     </compound>
 
     <compound name="KeyGroup" istemplate="1">
         Array of vector keys (anything that can be interpolated, except rotations).
         <add name="Num Keys" type="uint">Number of keys in the array.</add>
         <add name="Interpolation" type="KeyType" cond="Num Keys != 0">The key type.</add>
-        <add name="Keys" type="Key" arg="Interpolation" template="TEMPLATE" arr1="Num Keys">The keys.</add>
+        <add name="Keys" type="Key" arg="Interpolation" template="#T#" arr1="Num Keys">The keys.</add>
     </compound>
 
-    <compound name="QuatKey" istemplate="1"><!-- TEMPLATE should always be Quaternion -->
+    <compound name="QuatKey" istemplate="1"><!-- #T# should always be Quaternion -->
         A special version of the key type used for quaternions.  Never has tangents.
         <add name="Time" type="float" ver2="10.1.0.0">Time the key applies.</add>
-        <add name="Time" type="float" cond="ARG != 4" ver1="10.1.0.106">Time the key applies.</add>
-        <add name="Value" type="TEMPLATE" cond="ARG != 4">Value of the key.</add>
-        <add name="TBC" type="TBC" cond="ARG == 3">The TBC of the key.</add>
+        <add name="Time" type="float" cond="#ARG# != 4" ver1="10.1.0.106">Time the key applies.</add>
+        <add name="Value" type="#T#" cond="#ARG# != 4">Value of the key.</add>
+        <add name="TBC" type="TBC" cond="#ARG# == 3">The TBC of the key.</add>
     </compound>
 
     <compound name="TexCoord" size="8">
@@ -1726,38 +1726,38 @@
 	</bitflags>
     
 	<compound name="BSVertexData" versions="#SSE# #FO4#">
-		<add name="Vertex" type="Vector3" cond="(ARG #BITAND# 0x4010) == 0x4010" />
-		<add name="Bitangent X" type="float" cond="(ARG #BITAND# 0x4110) == 0x4110" />
-		<add name="Unknown Int" type="uint" cond="(ARG #BITAND# 0x4110) == 0x4010" />
-
-		<add name="Vertex" type="HalfVector3" cond="(ARG #BITAND# 0x4010) == 0x10" />
-		<add name="Bitangent X" type="hfloat" cond="(ARG #BITAND# 0x4110) == 0x110" />
-		<add name="Unknown Short" type="ushort" cond="(ARG #BITAND# 0x4110) == 0x10" />
-
-		<add name="UV" type="HalfTexCoord" cond="ARG #BITAND# 0x20" />
-		<add name="Normal" type="ByteVector3" cond="ARG #BITAND# 0x80" />
-		<add name="Bitangent Y" type="byte" cond="ARG #BITAND# 0x80" />
-		<add name="Tangent" type="ByteVector3" cond="(ARG #BITAND# 0x180) == 0x180" />
-		<add name="Bitangent Z" type="byte" cond="(ARG #BITAND# 0x180) == 0x180" />
-		<add name="Vertex Colors" type="ByteColor4" cond="ARG #BITAND# 0x200" />
-		<add name="Bone Weights" type="hfloat" arr1="4" cond="ARG #BITAND# 0x400" />
-		<add name="Bone Indices" type="byte" arr1="4" cond="ARG #BITAND# 0x400" />
-		<add name="Eye Data" type="float" cond="ARG #BITAND# 0x1000" />
+		<add name="Vertex" type="Vector3" cond="(#ARG# #BITAND# 0x4010) == 0x4010" />
+		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x4110) == 0x4110" />
+		<add name="Unknown Int" type="uint" cond="(#ARG# #BITAND# 0x4110) == 0x4010" />
+
+		<add name="Vertex" type="HalfVector3" cond="(#ARG# #BITAND# 0x4010) == 0x10" />
+		<add name="Bitangent X" type="hfloat" cond="(#ARG# #BITAND# 0x4110) == 0x110" />
+		<add name="Unknown Short" type="ushort" cond="(#ARG# #BITAND# 0x4110) == 0x10" />
+
+		<add name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x20" />
+		<add name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x80" />
+		<add name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x80" />
+		<add name="Tangent" type="ByteVector3" cond="(#ARG# #BITAND# 0x180) == 0x180" />
+		<add name="Bitangent Z" type="byte" cond="(#ARG# #BITAND# 0x180) == 0x180" />
+		<add name="Vertex Colors" type="ByteColor4" cond="#ARG# #BITAND# 0x200" />
+		<add name="Bone Weights" type="hfloat" arr1="4" cond="#ARG# #BITAND# 0x400" />
+		<add name="Bone Indices" type="byte" arr1="4" cond="#ARG# #BITAND# 0x400" />
+		<add name="Eye Data" type="float" cond="#ARG# #BITAND# 0x1000" />
 	</compound>
 
 	<compound name="BSVertexDataSSE" versions="#SSE# #FO4#">
-		<add name="Vertex" type="Vector3" cond="ARG #BITAND# 0x10" />
-		<add name="Bitangent X" type="float" cond="(ARG #BITAND# 0x110) == 0x110" />
-		<add name="Unknown Int" type="int" cond="(ARG #BITAND# 0x110) == 0x10" />
-		<add name="UV" type="HalfTexCoord" cond="ARG #BITAND# 0x20" />
-		<add name="Normal" type="ByteVector3" cond="ARG #BITAND# 0x80" />
-		<add name="Bitangent Y" type="byte" cond="ARG #BITAND# 0x80" />
-		<add name="Tangent" type="ByteVector3" cond="(ARG #BITAND# 0x180) == 0x180" />
-		<add name="Bitangent Z" type="byte" cond="(ARG #BITAND# 0x180) == 0x180" />
-		<add name="Vertex Colors" type="ByteColor4" cond="ARG #BITAND# 0x200" />
-		<add name="Bone Weights" type="hfloat" arr1="4" cond="ARG #BITAND# 0x400" />
-		<add name="Bone Indices" type="byte" arr1="4" cond="ARG #BITAND# 0x400" />
-		<add name="Eye Data" type="float" cond="ARG #BITAND# 0x1000" />
+		<add name="Vertex" type="Vector3" cond="#ARG# #BITAND# 0x10" />
+		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x110) == 0x110" />
+		<add name="Unknown Int" type="int" cond="(#ARG# #BITAND# 0x110) == 0x10" />
+		<add name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x20" />
+		<add name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x80" />
+		<add name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x80" />
+		<add name="Tangent" type="ByteVector3" cond="(#ARG# #BITAND# 0x180) == 0x180" />
+		<add name="Bitangent Z" type="byte" cond="(#ARG# #BITAND# 0x180) == 0x180" />
+		<add name="Vertex Colors" type="ByteColor4" cond="#ARG# #BITAND# 0x200" />
+		<add name="Bone Weights" type="hfloat" arr1="4" cond="#ARG# #BITAND# 0x400" />
+		<add name="Bone Indices" type="byte" arr1="4" cond="#ARG# #BITAND# 0x400" />
+		<add name="Eye Data" type="float" cond="#ARG# #BITAND# 0x1000" />
 	</compound>
 
     <compound name="BSVertexDesc" size="8" versions="#SSE# #FO4#">
@@ -1873,7 +1873,7 @@
         <add name="Interpolation" type="KeyType" ver2="10.1.0.0">Unlike most objects, the presense of this value is not conditional on there being keys.</add>
         <add name="Keys" type="Key" arg="Interpolation" template="float" arr1="Num Keys" ver2="10.1.0.0">The morph key frames.</add>
         <add name="Legacy Weight" type="float" ver1="10.1.0.104" ver2="20.1.0.2" vercond="#BSVER# #LT# 10" /> <!-- Exclude Bethesda -->
-        <add name="Vectors" type="Vector3" arr1="ARG">Morph vectors.</add>
+        <add name="Vectors" type="Vector3" arr1="#ARG#">Morph vectors.</add>
     </compound>
 
     <compound name="Particle" size="40">
@@ -1893,7 +1893,7 @@
         <add name="Bounding Sphere" type="NiBound">Note that its a Sphere Containing Axis Aligned Box not a minimum volume Sphere</add>
         <add name="Num Vertices" type="ushort">Number of weighted vertices.</add>
         <add name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver2="4.2.1.0">The vertex weights.</add>
-        <add name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver1="4.2.2.0" cond="ARG != 0">The vertex weights.</add>
+        <add name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver1="4.2.2.0" cond="#ARG# != 0">The vertex weights.</add>
     </compound>
 
     <compound name="HavokFilter" size="4" versions="#BETHESDA#">

From f64419a8943bfc7c6dad2f060e28e869ac02d2e8 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 7 Jun 2018 17:38:28 -0400
Subject: [PATCH 40/86] Add `int64` and `uint64`

For #76

Also reorganized the basic types to be in a logical order.
---
 nif.xml | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/nif.xml b/nif.xml
index 170387b..2d705c3 100644
--- a/nif.xml
+++ b/nif.xml
@@ -175,16 +175,16 @@
         A boolean; 32-bit from 4.0.0.2, and 8-bit from 4.1.0.1 on.
     </basic>
 
-    <basic name="byte" countable="true" size="1">
-        An unsigned 8-bit integer.
+    <basic name="char" countable="false" size="1">
+        An 8-bit character.
     </basic>
 
-    <basic name="uint" countable="true" size="4">
-        An unsigned 32-bit integer.
+    <basic name="byte" countable="true" size="1">
+        An unsigned 8-bit integer.
     </basic>
 
-    <basic name="ulittle32" countable="true" size="4">
-        A litte-endian unsigned 32-bit integer.
+    <basic name="short" countable="true" size="2">
+        A signed 16-bit integer.
     </basic>
 
     <basic name="ushort" countable="true" size="2">
@@ -195,8 +195,20 @@
         A signed 32-bit integer.
     </basic>
 
-    <basic name="short" countable="true" size="2">
-        A signed 16-bit integer.
+    <basic name="uint" countable="true" size="4">
+        An unsigned 32-bit integer.
+    </basic>
+
+    <basic name="ulittle32" countable="true" size="4">
+        A little-endian unsigned 32-bit integer.
+    </basic>
+
+    <basic name="int64" countable="true" size="8">
+        A signed 64-bit integer.
+    </basic>
+
+    <basic name="uint64" countable="true" size="8">
+        An unsigned 64-bit integer.
     </basic>
 
     <basic name="BlockTypeIndex" countable="false" size="2">
@@ -204,10 +216,6 @@
         The upper bit appears to be a flag used for PhysX block types.
     </basic>
 
-    <basic name="char" countable="false" size="1">
-        An 8-bit character.
-    </basic>
-
     <basic name="FileVersion" countable="false" size="4">
         A 32-bit integer that stores the version in hexadecimal format with each byte representing a number in the version string.
 

From 1aa013d8f6478da09037549924df968eb98af370 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 8 Jun 2018 07:34:44 -0400
Subject: [PATCH 41/86] Add `convertible`, split `countable`

For #76

The signed integeral types were marked as countable even though they should not be used for array sizes.  A negative value cannot be passed into an array size.   They are still integral though, so countable was split into `countable` and `integral`.

In addition,  added `boolean` to designate types that can toggle the presence of another member.

Also reordered items for `convertible` so that the referenced types come before the type referencing it, i.e. larger types first.
---
 nif.xml | 84 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/nif.xml b/nif.xml
index 2d705c3..4469a40 100644
--- a/nif.xml
+++ b/nif.xml
@@ -171,52 +171,52 @@
 
     <!--Basic Types-->
 
-    <basic name="bool" countable="true">
-        A boolean; 32-bit from 4.0.0.2, and 8-bit from 4.1.0.1 on.
+    <basic name="uint64" integral="true" countable="true" size="8">
+        An unsigned 64-bit integer.
     </basic>
 
-    <basic name="char" countable="false" size="1">
-        An 8-bit character.
+    <basic name="int64" integral="true" countable="false" size="8">
+        A signed 64-bit integer.
     </basic>
 
-    <basic name="byte" countable="true" size="1">
-        An unsigned 8-bit integer.
+    <basic name="ulittle32" integral="true" countable="true" size="4">
+        A little-endian unsigned 32-bit integer.
     </basic>
 
-    <basic name="short" countable="true" size="2">
-        A signed 16-bit integer.
+    <basic name="uint" integral="true" countable="true" size="4" convertible="uint64">
+        An unsigned 32-bit integer.
     </basic>
 
-    <basic name="ushort" countable="true" size="2">
-        An unsigned 16-bit integer.
+    <basic name="int" integral="true" countable="false" size="4" convertible="int64">
+        A signed 32-bit integer.
     </basic>
 
-    <basic name="int" countable="true" size="4">
-        A signed 32-bit integer.
+    <basic name="ushort" integral="true" countable="true" size="2" convertible="uint uint64">
+        An unsigned 16-bit integer.
     </basic>
 
-    <basic name="uint" countable="true" size="4">
-        An unsigned 32-bit integer.
+    <basic name="short" integral="true" countable="false" size="2" convertible="int int64">
+        A signed 16-bit integer.
     </basic>
 
-    <basic name="ulittle32" countable="true" size="4">
-        A little-endian unsigned 32-bit integer.
+    <basic name="char" integral="true" countable="false" size="1" convertible="short int int64">
+        An 8-bit character.
     </basic>
 
-    <basic name="int64" countable="true" size="8">
-        A signed 64-bit integer.
+    <basic name="byte" boolean="true" integral="true" countable="true" size="1" convertible="ushort uint uint64">
+        An unsigned 8-bit integer.
     </basic>
 
-    <basic name="uint64" countable="true" size="8">
-        An unsigned 64-bit integer.
+    <basic name="bool" boolean="true" integral="true" countable="false">
+        A boolean; 32-bit from 4.0.0.2, and 8-bit from 4.1.0.1 on.
     </basic>
 
-    <basic name="BlockTypeIndex" countable="false" size="2">
+    <basic name="BlockTypeIndex" integral="true" countable="false" size="2">
         A 16-bit (signed?) integer, which is used in the header to refer to a particular object type in a object type string array.
         The upper bit appears to be a flag used for PhysX block types.
     </basic>
 
-    <basic name="FileVersion" countable="false" size="4">
+    <basic name="FileVersion" integral="true" countable="false" size="4">
         A 32-bit integer that stores the version in hexadecimal format with each byte representing a number in the version string.
 
         Some widely-used versions and their hex representation:
@@ -232,42 +232,42 @@
         20.0.0.5:   0x14000005
     </basic>
 
-    <basic name="Flags" countable="false" size="2">
+    <basic name="Flags" integral="true" countable="false" size="2">
         A 16-bit integer, used for bit flags.  Function varies by object type.
     </basic>
 
-    <basic name="float" countable="false" size="4">
+    <basic name="float" integral="false" size="4">
         A standard 32-bit floating point number.
     </basic>
     
-    <basic name="hfloat" countable="false" size="2">
+    <basic name="hfloat" integral="false" size="2" convertible="float">
         A 16-bit floating point number.
     </basic>
     
-    <basic name="HeaderString" countable="false">
+    <basic name="HeaderString" integral="false">
         A variable length string that ends with a newline character (0x0A).  The string starts as follows depending on the version:
 
         Version &lt;= 10.0.1.0:  'NetImmerse File Format'
         Version &gt;= 10.1.0.0:  'Gamebryo File Format'
     </basic>
 
-    <basic name="LineString" countable="false">
+    <basic name="LineString" integral="false">
         A variable length string that ends with a newline character (0x0A).
     </basic>
 
-    <basic name="Ptr" countable="false" istemplate="1" size="4">
+    <basic name="Ptr" integral="true" countable="false" istemplate="1" size="4">
         A signed 32-bit integer, referring to a object before this one in the hierarchy.  Examples:  Bones, gravity objects.
     </basic>
 
-    <basic name="Ref" countable="false" istemplate="1" size="4">
+    <basic name="Ref" integral="true" countable="false" istemplate="1" size="4">
         A signed 32-bit integer, used to refer to another object; -1 means no reference. These should always point down the hierarchy. Other types are used for indexes that point to objects higher up.
     </basic>
 
-    <basic name="StringOffset" countable="false" size="4">
+    <basic name="StringOffset" integral="true" countable="false" size="4">
         A 32-bit unsigned integer, used to refer to strings in a NiStringPalette.
     </basic>
 
-    <basic name="StringIndex" countable="false" size="4">
+    <basic name="StringIndex" integral="true" countable="false" size="4">
         A 32-bit unsigned integer, used to refer to strings in the header.
     </basic>
     
@@ -1350,7 +1350,7 @@
         <add name="b" type="float">Blue color component.</add>
     </compound>
 
-    <compound name="ByteColor3" size="3">
+    <compound name="ByteColor3" size="3" convertible="Color3">
         A color without alpha (red, green, blue).
         <add name="r" type="byte">Red color component.</add>
         <add name="g" type="byte">Green color component.</add>
@@ -1365,7 +1365,7 @@
         <add name="a" type="float">Alpha.</add>
     </compound>
 
-    <compound name="ByteColor4" size="4">
+    <compound name="ByteColor4" size="4" convertible="Color4">
         A color with alpha (red, green, blue, alpha).
         <add name="r" type="byte">Red color component.</add>
         <add name="g" type="byte">Green color component.</add>
@@ -1398,25 +1398,25 @@
         <add name="Vertex Indices" type="ushort" arr1="Num Vertices">The vertex indices.</add>
     </compound>
     
-    <compound name="ByteVector3" size="3">
+    <compound name="Vector3" size="12">
         A vector in 3D space (x,y,z).
-        <add name="x" type="byte">First coordinate.</add>
-        <add name="y" type="byte">Second coordinate.</add>
-        <add name="z" type="byte">Third coordinate.</add>
+        <add name="x" type="float">First coordinate.</add>
+        <add name="y" type="float">Second coordinate.</add>
+        <add name="z" type="float">Third coordinate.</add>
     </compound>
     
-    <compound name="HalfVector3" size="6">
+    <compound name="HalfVector3" size="6" convertible="Vector3">
         A vector in 3D space (x,y,z).
         <add name="x" type="hfloat">First coordinate.</add>
         <add name="y" type="hfloat">Second coordinate.</add>
         <add name="z" type="hfloat">Third coordinate.</add>
     </compound>
 
-    <compound name="Vector3" size="12">
+    <compound name="ByteVector3" size="3" convertible="Vector3">
         A vector in 3D space (x,y,z).
-        <add name="x" type="float">First coordinate.</add>
-        <add name="y" type="float">Second coordinate.</add>
-        <add name="z" type="float">Third coordinate.</add>
+        <add name="x" type="byte">First coordinate.</add>
+        <add name="y" type="byte">Second coordinate.</add>
+        <add name="z" type="byte">Third coordinate.</add>
     </compound>
 
     <compound name="Vector4" size="16">

From 70edce19dc8810ac1c7a34bb6b6053c60ed27e76 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 8 Jun 2018 08:24:51 -0400
Subject: [PATCH 42/86] [Linting] Types that cannot be used as array sizes

For #74

Implemented thanks to changes done in #76 for differentiating integral and "countable" i.e. can be used for sizes.

Marking types as boolean was also in #76, yet there were no errors for this lint; all the `cond` references that were not complex expressions were already boolean types.
---
 nif.xml | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/nif.xml b/nif.xml
index 4469a40..9728c13 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2197,7 +2197,7 @@
 
     <compound name="DecalVectorArray" versions="#FO3_AND_LATER#">
         Array of Vectors for Decal placement in BSDecalPlacementVectorExtraData.
-        <add name="Num Vectors" type="short" />
+        <add name="Num Vectors" type="ushort" />
         <add name="Points" type="Vector3" arr1="Num Vectors">Vector XYZ coords</add>
         <add name="Normals" type="Vector3" arr1="Num Vectors">Vector Normals</add>
     </compound>
@@ -3661,7 +3661,7 @@
         <add name="Name" type="string">The sequence name by which the animation system finds and manages this sequence.</add>
         <add name="Accum Root Name" type="string" ver2="10.1.0.103">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
         <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver2="10.1.0.103" />
-        <add name="Num DIV2 Ints" type="int" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
+        <add name="Num DIV2 Ints" type="uint" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
         <add name="DIV2 Ints" type="int" arr1="Num DIV2 Ints" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
         <add name="DIV2 Ref" type="Ref" template="NiObject" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
         <add name="Num Controlled Blocks" type="uint" />
@@ -5111,7 +5111,7 @@
 
     <niobject name="NiPhysXPropDesc" inherit="NiObject" since="V20_2_0_8">
         For serialization of PhysX objects and to attach them to the scene.
-        <add name="Num Actors" type="int" />
+        <add name="Num Actors" type="uint" />
         <add name="Actors" type="Ref" template="NiPhysXActorDesc" arr1="Num Actors" />
         <add name="Num Joints" type="uint" />
         <add name="Joints" type="Ref" template="NiPhysXJointDesc" arr1="Num Joints" />
@@ -5447,7 +5447,7 @@
     <niobject name="NiRoomGroup" inherit="NiNode">
         NiRoomGroup represents a set of connected rooms i.e. a game level.
         <add name="Shell" type="Ptr" template="NiNode">Object that represents the room group as seen from the outside.</add>
-        <add name="Num Rooms" type="int" />
+        <add name="Num Rooms" type="uint" />
         <add name="Rooms" type="Ptr" template="NiRoom" arr1="Num Rooms" />
     </niobject>
 
@@ -5457,7 +5457,7 @@
 
     <niobject name="NiRoom" inherit="NiNode">
         NiRoom objects represent cells in a cell-portal culling system.
-        <add name="Num Walls" type="int" />
+        <add name="Num Walls" type="uint" />
         <add name="Walls" type="Ref" template="NiWall" arr1="Num Walls" ver2="3.3.0.13" />
         <add name="Wall Planes" type="NiPlane" arr1="Num Walls" ver1="4.0.0.0" />
         <add name="Num In Portals" type="uint" />
@@ -5651,7 +5651,7 @@
 
    <niobject name="BSShaderTextureSet" inherit="NiObject" versions="#BETHESDA#">
         Bethesda-specific Texture Set.
-        <add name="Num Textures" type="int" default="6" />
+        <add name="Num Textures" type="uint" default="6" />
         <add name="Textures" type="SizedString" arr1="Num Textures">Textures.
             0: Diffuse
             1: Normal/Gloss
@@ -5970,13 +5970,13 @@
 
     <niobject name="BSDismemberSkinInstance" inherit="NiSkinInstance" versions="#BETHESDA#">
         Bethesda-specific skin instance.
-        <add name="Num Partitions" type="int" />
+        <add name="Num Partitions" type="uint" />
         <add name="Partitions" type="BodyPartList" arr1="Num Partitions" />
     </niobject>
 
     <niobject name="BSDecalPlacementVectorExtraData" inherit="NiFloatExtraData" versions="#FO3_AND_LATER#">
         Bethesda-specific extra data. Lists locations and normals on a mesh that are appropriate for decal placement.
-        <add name="Num Vector Blocks" type="short" />
+        <add name="Num Vector Blocks" type="ushort" />
         <add name="Vector Blocks" type="DecalVectorArray" arr1="Num Vector Blocks" />
     </niobject>
 
@@ -6034,7 +6034,7 @@
     <niobject name="BSMasterParticleSystem" inherit="NiNode" versions="#FO3_AND_LATER#">
         Bethesda-Specific particle system.
         <add name="Max Emitter Objects" type="ushort" />
-        <add name="Num Particle Systems" type="int" />
+        <add name="Num Particle Systems" type="uint" />
         <add name="Particle Systems" type="Ref" template="NiAVObject" arr1="Num Particle Systems" />
 
     </niobject>
@@ -6109,7 +6109,7 @@
 
     <niobject name="BSTreadTransfInterpolator" inherit="NiInterpolator" versions="#FO3_AND_LATER#">
         Bethesda-specific interpolator.
-        <add name="Num Tread Transforms" type="int" />
+        <add name="Num Tread Transforms" type="uint" />
         <add name="Tread Transforms" type="BSTreadTransform" arr1="Num Tread Transforms" />
         <add name="Data" type="Ref" template="NiFloatData" />
     </niobject>
@@ -6206,7 +6206,7 @@
 
     <niobject name="BSSegmentedTriShape" inherit="NiTriShape" versions="#FO3_AND_LATER#">
         Bethesda-specific AV object.
-        <add name="Num Segments" type="int" >Number of segments in the square grid</add>
+        <add name="Num Segments" type="uint" >Number of segments in the square grid</add>
         <add name="Segment" type="BSGeometrySegmentData" arr1="Num Segments">Configuration of each segment</add>
     </niobject>
 
@@ -6229,11 +6229,11 @@
     <compound name="AdditionalDataBlock">
         <!-- todo: check if this is essentially the same as BSPackedAdditionalData, i.e. if this is identical to BSPackedAdditionalData minus its last two fields -->
         <add name="Has Data" type="bool">Has data</add>
-        <add name="Block Size" type="int" cond="Has Data">Size of Block</add>
-        <add name="Num Blocks" type="int" cond="Has Data" />
+        <add name="Block Size" type="uint" cond="Has Data">Size of Block</add>
+        <add name="Num Blocks" type="uint" cond="Has Data" />
         <add name="Block Offsets" type="int" arr1="Num Blocks" cond="Has Data" />
 
-        <add name="Num Data" type="int" cond="Has Data" />
+        <add name="Num Data" type="uint" cond="Has Data" />
         <add name="Data Sizes" type="int" arr1="Num Data" cond="Has Data" />
         <add name="Data" type="byte" arr1="Num Data" arr2="Block Size" cond="Has Data" />
     </compound>
@@ -6241,11 +6241,11 @@
     <compound name="BSPackedAdditionalDataBlock" versions="#BETHESDA#">
         <!-- see Fallout NV (nvdlc01vaultposter01.nif) -->
         <add name="Has Data" type="bool">Has data</add>
-        <add name="Num Total Bytes" type="int" cond="Has Data">Total number of bytes (over all channels and all elements, equals num total bytes per element times num vertices).</add>
-        <add name="Num Blocks" type="int" cond="Has Data">Number of blocks? Usually equal to one.</add>
+        <add name="Num Total Bytes" type="uint" cond="Has Data">Total number of bytes (over all channels and all elements, equals num total bytes per element times num vertices).</add>
+        <add name="Num Blocks" type="uint" cond="Has Data">Number of blocks? Usually equal to one.</add>
         <add name="Block Offsets" type="int" arr1="Num Blocks" cond="Has Data">Block offsets in the data? Usually equal to zero.</add>
 
-        <add name="Num Atoms" type="int" cond="Has Data">Number of atoms?</add>
+        <add name="Num Atoms" type="uint" cond="Has Data">Number of atoms?</add>
         <add name="Atom Sizes" type="int" arr1="Num Atoms" cond="Has Data">The sum of all of these equal num total bytes per element, so this probably describes how each data element breaks down into smaller chunks (i.e. atoms).</add>
         <add name="Data" type="byte" arr1="Num Total Bytes" cond="Has Data" />
         <add name="Unknown Int 1" type="int" />
@@ -6256,7 +6256,7 @@
         <add name="Num Vertices" type="ushort">Number of vertices</add>
         <add name="Num Block Infos" type="uint">Information about additional data blocks</add>
         <add name="Block Infos" type="AdditionalDataInfo" arr1="Num Block Infos">Number of additional data blocks</add>
-        <add name="Num Blocks" type="int">Number of additional data blocks</add>
+        <add name="Num Blocks" type="uint">Number of additional data blocks</add>
         <add name="Blocks" type="AdditionalDataBlock" arr1="Num Blocks">Number of additional data blocks</add>
     </niobject>
 
@@ -6265,13 +6265,13 @@
         <add name="Num Vertices" type="ushort" />
         <add name="Num Block Infos" type="uint">Information about additional data blocks</add>
         <add name="Block Infos" type="AdditionalDataInfo" arr1="Num Block Infos">Number of additional data blocks</add>
-        <add name="Num Blocks" type="int">Number of additional data blocks. Usually there is exactly one block.</add>
+        <add name="Num Blocks" type="uint">Number of additional data blocks. Usually there is exactly one block.</add>
         <add name="Blocks" type="BSPackedAdditionalDataBlock" arr1="Num Blocks">Number of additional data blocks</add>
     </niobject>
 
     <niobject name="BSWArray" inherit="NiExtraData" versions="#FO3_AND_LATER#">
         Bethesda-specific extra data.
-        <add name="Num Items" type="int" />
+        <add name="Num Items" type="uint" />
         <add name="Items" type="int" arr1="Num Items" />
     </niobject>
 
@@ -6314,15 +6314,15 @@
         Found in Fallout 3 .psa files, extra ragdoll info for NPCs/creatures. (usually idleanims\deathposes.psa)
         Defines different kill poses. The game selects the pose randomly and applies it to a skeleton immediately upon ragdolling.
         Poses can be previewed in GECK Object Window-Actor Data-Ragdoll and selecting Pose Matching tab.
-        <add name="Num Bones" type="int" />
+        <add name="Num Bones" type="uint" />
         <add name="Bones" type="string" arr1="Num Bones" />
-        <add name="Num Poses" type="int" />
+        <add name="Num Poses" type="uint" />
         <add name="Poses" type="BonePose" arr1="Num Poses" />
     </niobject>
 
     <niobject name="bhkRagdollTemplate" inherit="NiExtraData" versions="#FO3_AND_LATER#">
         Found in Fallout 3, more ragdoll info?  (meshes\ragdollconstraint\*.rdt)
-        <add name="Num Bones" type="int" />
+        <add name="Num Bones" type="uint" />
         <add name="Bones" type="Ref" template="NiObject" arr1="Num Bones" />
     </niobject>
 
@@ -7598,13 +7598,13 @@
     <niobject name="BSConnectPoint::Children" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Item Slot Child
         <add name="Skinned" type="bool" />
-        <add name="Num Points" type="int" />
+        <add name="Num Points" type="uint" />
         <add name="Point Name" type="SizedString" arr1="Num Points" />
     </niobject>
     
     <niobject name="BSEyeCenterExtraData" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Eye Center Data
-        <add name="Num Data" type="int" />
+        <add name="Num Data" type="uint" />
         <add name="Data" type="float" arr1="Num Data" />
     </niobject>
 	

From 331d2c782a02d0ce9a5a68dc91264b3557a4c3d6 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 14 Jun 2018 13:45:32 -0400
Subject: [PATCH 43/86] RSH and LSH operators

For #70

Their use was discussed as being useful for shifting and masking values before sending as an ARG.
---
 nif.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nif.xml b/nif.xml
index 9728c13..52013ea 100644
--- a/nif.xml
+++ b/nif.xml
@@ -165,6 +165,8 @@
         <operator token="#GTE#" string="&gt;=" />
         <operator token="#EQ#" string="==" />
         <operator token="#NEQ#" string="!=" />
+        <operator token="#RSH#" string="&gt;&gt;" />
+        <operator token="#LSH#" string="&lt;&lt;" />
         <operator token="#BITAND#" string="&amp;" />
         <operator token="#BITOR#" string="|" />
     </token>

From cd1af9c93a50ca6a3bad7c03fb8bd0b8d531bf0d Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 14 Jun 2018 15:05:42 -0400
Subject: [PATCH 44/86] Add `bitfield` type, remove 'Flags'

For #3, #76

Replaces all Flags types with real enums (where there were only two options) or a new bitfield type.

Bitfield mimics the bitfield syntax of C structs (Compounds), but also acts like Enum/Bitflags with the `storage` attribute in that the entire structure can simply be aliased to a basic type like `ushort`.

The `type` on each Bitfield member does **NOT denote size**.  Each member only takes up the bits that are defined by `width` and `pos`.  The `type` information is for casting for getters and setters.  That means for C structs, code generation would not use the type on each member, but the storage type instead.
---
 nif.xml | 265 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 159 insertions(+), 106 deletions(-)

diff --git a/nif.xml b/nif.xml
index 52013ea..274b114 100644
--- a/nif.xml
+++ b/nif.xml
@@ -234,10 +234,6 @@
         20.0.0.5:   0x14000005
     </basic>
 
-    <basic name="Flags" integral="true" countable="false" size="2">
-        A 16-bit integer, used for bit flags.  Function varies by object type.
-    </basic>
-
     <basic name="float" integral="false" size="4">
         A standard 32-bit floating point number.
     </basic>
@@ -868,14 +864,14 @@
         <option value="6" name="FILTER_ANISOTROPIC">Anisotropic filtering. One or many trilinear samples depending on anisotropy.</option>
     </enum>
 
-    <enum name="VertMode" storage="uint">
+    <enum name="SourceVertexMode" storage="uint">
         Describes how to apply vertex colors for NiVertexColorProperty.
         <option value="0" name="VERT_MODE_SRC_IGNORE">Emissive, ambient, and diffuse colors are all specified by the NiMaterialProperty.</option>
         <option value="1" name="VERT_MODE_SRC_EMISSIVE">Emissive colors are specified by the source vertex colors. Ambient+Diffuse are specified by the NiMaterialProperty.</option>
         <option value="2" name="VERT_MODE_SRC_AMB_DIF">Ambient+Diffuse colors are specified by the source vertex colors. Emissive is specified by the NiMaterialProperty. (Default)</option>
     </enum>
 
-    <enum name="LightMode" storage="uint">
+    <enum name="LightingMode" storage="uint">
         Describes which lighting equation components influence the final vertex color for NiVertexColorProperty.
         <option value="0" name="LIGHT_MODE_EMISSIVE">Emissive.</option>
         <option value="1" name="LIGHT_MODE_EMI_AMB_DIF">Emissive + Ambient + Diffuse. (Default)</option>
@@ -907,7 +903,7 @@
         <option value="9" name="ROTATE_ABOUT_UP2">The billboard will only rotate around the up axis (same as ROTATE_ABOUT_UP?).</option>
     </enum>
 
-    <enum name="StencilCompareMode" storage="uint">
+    <enum name="StencilTestFunc" storage="uint" prefix="STENCIL">
         Describes stencil buffer test modes for NiStencilProperty.
         <option value="0" name="TEST_NEVER">Always false. Ref value is ignored.</option>
         <option value="1" name="TEST_LESS">VRef ‹ VBuf</option>
@@ -937,17 +933,32 @@
         <option value="3" name="DRAW_BOTH">Draw all triangles, regardless of orientation. (Effectively force double-sided)</option>
     </enum>
 
-    <enum name="ZCompareMode" storage="uint">
+    <enum name="TestFunction" storage="uint">
         Describes Z-buffer test modes for NiZBufferProperty.
         "Less than" = closer to camera, "Greater than" = further from camera.
-        <option value="0" name="ZCOMP_ALWAYS">Always true. Buffer is ignored.</option>
-        <option value="1" name="ZCOMP_LESS">VRef ‹ VBuf</option>
-        <option value="2" name="ZCOMP_EQUAL">VRef = VBuf</option>
-        <option value="3" name="ZCOMP_LESS_EQUAL">VRef ≤ VBuf</option>
-        <option value="4" name="ZCOMP_GREATER">VRef › VBuf</option>
-        <option value="5" name="ZCOMP_NOT_EQUAL">VRef ≠ VBuf</option>
-        <option value="6" name="ZCOMP_GREATER_EQUAL">VRef ≥ VBuf</option>
-        <option value="7" name="ZCOMP_NEVER">Always false. Ref value is ignored.</option>
+        <option value="0" name="TEST_ALWAYS">Always true. Buffer is ignored.</option>
+        <option value="1" name="TEST_LESS">VRef ‹ VBuf</option>
+        <option value="2" name="TEST_EQUAL">VRef = VBuf</option>
+        <option value="3" name="TEST_LESS_EQUAL">VRef ≤ VBuf</option>
+        <option value="4" name="TEST_GREATER">VRef › VBuf</option>
+        <option value="5" name="TEST_NOT_EQUAL">VRef ≠ VBuf</option>
+        <option value="6" name="TEST_GREATER_EQUAL">VRef ≥ VBuf</option>
+        <option value="7" name="TEST_NEVER">Always false. Ref value is ignored.</option>
+    </enum>
+
+    <enum name="AlphaFunction" storage="ushort" prefix="ALPHA">
+        Describes alpha blend modes for NiAlphaProperty.
+        <option value="0" name="ONE" />
+        <option value="1" name="ZERO" />
+        <option value="2" name="SRC_COLOR" />
+        <option value="3" name="INV_SRC_COLOR" />
+        <option value="4" name="DEST_COLOR" />
+        <option value="5" name="INV_DEST_COLOR" />
+        <option value="6" name="SRC_ALPHA" />
+        <option value="7" name="INV_SRC_ALPHA" />
+        <option value="8" name="DEST_ALPHA" />
+        <option value="9" name="INV_DEST_ALPHA" />
+        <option value="10" name="SRC_ALPHA_SATURATE" />
     </enum>
 
     <enum name="hkMotionType" storage="byte" versions="#BETHESDA#">
@@ -1316,6 +1327,114 @@
         <option value="13" name="Malleable">A malleable constraint.</option>
     </enum>
 
+    <enum name="FogFunction" storage="ushort">
+        <option value="0" name="FOG_Z_LINEAR" />
+        <option value="1" name="FOG_RANGE_SQ" />
+        <option value="2" name="FOG_VERTEX_ALPHA" />
+    </enum>
+
+    <enum name="AnimType" storage="ushort">
+        <option value="0" name="APP_TIME" />
+        <option value="1" name="APP_INIT" />
+    </enum>
+
+    <enum name="DitherFlags" storage="ushort">
+        Flags for NiDitherProperty
+        <option value="0" name="DITHER_DISABLED" />
+        <option value="1" name="DITHER_ENABLED" />
+    </enum>
+
+    <enum name="ShadeFlags" storage="ushort">
+        Flags for NiShadeProperty
+        <option value="0" name="SHADING_HARD" />
+        <option value="1" name="SHADING_SMOOTH" />
+    </enum>
+
+    <enum name="SpecularFlags" storage="ushort">
+        Flags for NiSpecularProperty
+        <option value="0" name="SPECULAR_DISABLED" />
+        <option value="1" name="SPECULAR_ENABLED" />
+    </enum>
+
+    <enum name="WireframeFlags" storage="ushort">
+        Flags for NiWireframeProperty
+        <option value="0" name="WIREFRAME_DISABLED" />
+        <option value="1" name="WIREFRAME_ENABLED" />
+    </enum>
+
+    <enum name="GeomMorpherFlags" storage="ushort">
+        Flags for NiGeomMorpherController
+        <option value="0" name="UPDATE_NORMALS_DISABLED" />
+        <option value="1" name="UPDATE_NORMALS_ENABLED" />
+    </enum>
+
+    <!-- Bitfields -->
+
+    <bitfield name="TimeControllerFlags" storage="ushort">
+        Flags for NiTimeController
+        <member width="1" pos="0" mask="0x0001" name="Anim Type" type="AnimType" />
+        <member width="2" pos="1" mask="0x0006" name="Cycle Type" type="CycleType" default="CYCLE_CLAMP" />
+        <member width="1" pos="3" mask="0x0008" name="Active" type="bool" default="1" />
+        <member width="1" pos="4" mask="0x0010" name="Play Backwards" type="bool" />
+        <member width="1" pos="5" mask="0x0020" name="Manager Controlled" type="bool" />
+        <member width="1" pos="6" mask="0x0040" name="Compute Scaled Time" type="bool" default="1" />
+        <member width="1" pos="7" mask="0x0080" name="Forced Update" type="bool" />
+    </bitfield>
+
+    <bitfield name="AlphaFlags" storage="ushort">
+        Flags for NiAlphaProperty
+        <member width="1" pos="0" mask="0x0001" name="Alpha Blend" type="bool" />
+        <member width="4" pos="1" mask="0x001E" name="Source Blend Mode" type="AlphaFunction" default="SRC_ALPHA" />
+        <member width="4" pos="5" mask="0x01E0" name="Destination Blend Mode" type="AlphaFunction" default="INV_SRC_ALPHA" />
+        <member width="1" pos="9" mask="0x0200" name="Alpha Test" type="bool" default="1" />
+        <member width="3" pos="10" mask="0x1C00" name="Test Func" type="TestFunction" default="TEST_GREATER" />
+        <member width="1" pos="13" mask="0x2000" name="No Sorter" type="bool" />
+    </bitfield>
+
+    <bitfield name="FogFlags" storage="ushort">
+        Flags for NiFogProperty
+        <member width="1" pos="0" mask="0x0001" name="Enable" type="bool" />
+        <member width="3" pos="1" mask="0x0006" name="Fog Function" type="FogFunction" />
+    </bitfield>
+
+    <bitfield name="StencilFlags" storage="ushort">
+        Flags for NiStencilProperty
+        <member width="1" pos="0" mask="0x0001" name="Enable" type="bool" />
+        <member width="3" pos="1" mask="0x000E" name="Fail Action" type="StencilAction" default="ACTION_KEEP" />
+        <member width="3" pos="4" mask="0x0070" name="ZFail Action" type="StencilAction" default="ACTION_KEEP" />
+        <member width="3" pos="7" mask="0x0380" name="Pass Action" type="StencilAction" default="ACTION_INCREMENT" />
+        <member width="2" pos="10" mask="0x0C00" name="Draw Mode" type="StencilDrawMode" default="DRAW_BOTH" />
+        <member width="3" pos="12" mask="0xF000" name="Test Func" type="StencilTestFunc" default="TEST_GREATER" />
+    </bitfield>
+
+    <bitfield name="TexturingFlags" storage="ushort">
+        Flags for NiTexturingProperty
+        <member width="1" pos="0" mask="0x0001" name="Multitexture" type="bool" />
+        <member width="3" pos="1" mask="0x000E" name="Apply Mode" type="ApplyMode" />
+        <member width="8" pos="4" mask="0x0FF0" name="Decal Count" type="ushort" />
+    </bitfield>
+
+    <bitfield name="TexturingMapFlags" storage="ushort">
+        Flags for NiTexturingProperty
+        <member width="8" pos="0" mask="0x00FF" name="Texture Index" type="ushort" />
+        <member width="4" pos="8" mask="0x0F00" name="Filter Mode" type="TexFilterMode" />
+        <member width="4" pos="12" mask="0x3000" name="Clamp Mode" type="TexClampMode" />
+    </bitfield>
+
+    <bitfield name="VertexColorFlags" storage="ushort">
+        Flags for NiVertexColorProperty
+        <member width="3" pos="0" mask="0x0007" name="Color Mode" type="ushort" />
+        <member width="1" pos="3" mask="0x0008" name="Lighting Mode" type="LightingMode" />
+        <member width="2" pos="4" mask="0x0030" name="Source Vertex Mode" type="SourceVertexMode" />
+    </bitfield>
+
+    <bitfield name="ZBufferFlags" storage="ushort">
+        Flags for NiZBufferProperty
+        <member width="1" pos="0" mask="0x0001" name="ZBuffer Test" type="bool" />
+        <member width="1" pos="1" mask="0x0002" name="ZBuffer Write" type="bool" />
+        <member width="3" pos="2" mask="0x003C" name="Test Func" type="TestFunction" />
+    </bitfield>
+
     <!--Compounds
         These are like C structures and are used as sub-parts of more complex
         classes when there are multiple pieces of data repeated in an array.-->
@@ -1690,7 +1809,7 @@
         <add name="Source" type="Ref" template="NiSourceTexture" ver1="3.3.0.13">NiSourceTexture object index.</add>
         <add name="Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" ver2="20.0.0.5">0=clamp S clamp T, 1=clamp S wrap T, 2=wrap S clamp T, 3=wrap S wrap T</add>
         <add name="Filter Mode" type="TexFilterMode" default="FILTER_TRILERP" ver2="20.0.0.5">0=nearest, 1=bilinear, 2=trilinear, 3=..., 4=..., 5=...</add>
-        <add name="Flags" type="Flags" ver1="20.1.0.3">Texture mode flags; clamp and filter mode stored in upper byte with 0xYZ00 = clamp mode Y, filter mode Z.</add>
+        <add name="Flags" type="TexturingMapFlags" ver1="20.1.0.3">Texture mode flags; clamp and filter mode stored in upper byte with 0xYZ00 = clamp mode Y, filter mode Z.</add>
         <add name="Max Anisotropy" type="ushort" ver1="20.5.0.4" />
         <add name="UV Set" type="uint" default="0" ver2="20.0.0.5">The texture coordinate set in NiGeometryData that this texture slot will use.</add>
         <add name="PS2 L" type="short" default="0" ver2="10.4.0.1">L can range from 0 to 3 and are used to specify how fast a texture gets blurry.</add>
@@ -2907,8 +3026,8 @@
 
     <niobject name="NiAVObject" abstract="1" inherit="NiObjectNET">
         Abstract audio-visual base class from which all of Gamebryo's scene graph objects inherit.
-        <add name="Flags" type="uint" default="14" vercond="#BSVER# #GT# 26">Basic flags for AV objects. For Bethesda streams above 26 only.</add>
-        <add name="Flags" type="Flags" ver1="3.0" vercond="#BSVER# #LTE# 26">Basic flags for AV objects; commonly 0x000C or 0x000A.</add>
+        <add name="Flags" type="uint" default="524302" vercond="#BSVER# #GT# 26">Basic flags for AV objects. For Bethesda streams above 26 only.</add>
+        <add name="Flags" type="ushort" ver1="3.0" vercond="#BSVER# #LTE# 26">Basic flags for AV objects; commonly 0x000C or 0x000A.</add>
         <add name="Translation" type="Vector3">The translation vector.</add>
         <add name="Rotation" type="Matrix33">The rotation part of the transformation matrix.</add>
         <add name="Scale" type="float" default="1.0">Scaling part (only uniform scaling is supported).</add>
@@ -2981,16 +3100,7 @@
     <niobject name="NiTimeController" abstract="1" inherit="NiObject">
         Abstract base class that provides the base timing and update functionality for all the Gamebryo animation controllers.
         <add name="Next Controller" type="Ref" template="NiTimeController">Index of the next controller.</add>
-        <add name="Flags" type="Flags">
-            Controller flags.
-            Bit 0 : Anim type, 0=APP_TIME 1=APP_INIT
-            Bit 1-2 : Cycle type, 00=Loop 01=Reverse 10=Clamp
-            Bit 3 : Active
-            Bit 4 : Play backwards
-            Bit 5 : Is manager controlled
-            Bit 6 : Compute scaled time (take frequency and phase into account)
-            Bit 7 : Force update
-        </add>
+        <add name="Flags" type="TimeControllerFlags" default="76" />
         <add name="Frequency" type="float" default="1.0">Frequency (is usually 1.0).</add>
         <add name="Phase" type="float">Phase (usually 0.0).</add>
         <add name="Start Time" type="float" default="#FLT_MAX#">Controller start time.</add>
@@ -3014,7 +3124,7 @@
     <niobject name="NiGeomMorpherController" inherit="NiInterpController">
         DEPRECATED (20.5), replaced by NiMorphMeshModifier.
         Time controller for geometry morphing.
-        <add name="Extra Flags" type="Flags" ver1="10.0.1.2">1 = UPDATE NORMALS</add>
+        <add name="Extra Flags" type="GeomMorpherFlags" ver1="10.0.1.2" />
         <add name="Data" type="Ref" template="NiMorphData">Geometry morphing data index.</add>
         <add name="Always Update" type="byte" ver1="4.0.0.1" />
         <add name="Num Interpolators" type="uint" ver1="10.1.0.106" />
@@ -3400,37 +3510,7 @@
 
     <niobject name="NiAlphaProperty" inherit="NiProperty">
         Transparency. Flags 0x00ED.
-        <add name="Flags" type="Flags" default="4844">
-            Bit 0 : alpha blending enable
-            Bits 1-4 : source blend mode
-            Bits 5-8 : destination blend mode
-            Bit 9 : alpha test enable
-            Bit 10-12 : alpha test mode
-            Bit 13 : no sorter flag ( disables triangle sorting )
-
-            blend modes (glBlendFunc):
-            0000 GL_ONE
-            0001 GL_ZERO
-            0010 GL_SRC_COLOR
-            0011 GL_ONE_MINUS_SRC_COLOR
-            0100 GL_DST_COLOR
-            0101 GL_ONE_MINUS_DST_COLOR
-            0110 GL_SRC_ALPHA
-            0111 GL_ONE_MINUS_SRC_ALPHA
-            1000 GL_DST_ALPHA
-            1001 GL_ONE_MINUS_DST_ALPHA
-            1010 GL_SRC_ALPHA_SATURATE
-
-            test modes (glAlphaFunc):
-            000 GL_ALWAYS
-            001 GL_LESS
-            010 GL_EQUAL
-            011 GL_LEQUAL
-            100 GL_GREATER
-            101 GL_NOTEQUAL
-            110 GL_GEQUAL
-            111 GL_NEVER
-        </add>
+        <add name="Flags" type="AlphaFlags" default="4844" />
         <add name="Threshold" type="byte" default="128">Threshold for alpha testing (see: glAlphaFunc)</add>
         <add name="Unknown Short 1" type="ushort" ver2="2.3" />
         <add name="Unknown Int 2" type="uint" ver2="2.3" />
@@ -3708,7 +3788,7 @@
 
     <niobject name="NiDitherProperty" inherit="NiProperty">
         NiDitherProperty allows the application to turn the dithering of interpolated colors and fog values on and off.
-        <add name="Flags" type="Flags">1 = Enable dithering</add>
+        <add name="Flags" type="DitherFlags" />
     </niobject>
 
     <niobject name="NiRollController" inherit="NiSingleInterpController" until="V20_5_0_0">
@@ -3734,13 +3814,7 @@
 
     <niobject name="NiFogProperty" inherit="NiProperty">
         NiFogProperty allows the application to enable, disable and control the appearance of fog.
-        <add name="Flags" type="Flags">
-            Bit 0: Enables Fog
-            Bit 1: Sets Fog Function to FOG_RANGE_SQ
-            Bit 2: Sets Fog Function to FOG_VERTEX_ALPHA
-
-            If Bit 1 and Bit 2 are not set, but fog is enabled, Fog function is FOG_Z_LINEAR.
-        </add>
+        <add name="Flags" type="FogFlags" />
         <add name="Fog Depth" type="float" default="1.0">Depth of the fog in normalized units. 1.0 = begins at near plane. 0.5 = begins halfway between the near and far planes.</add>
         <add name="Fog Color" type="Color3">The color of the fog.</add>
     </niobject>
@@ -3826,7 +3900,7 @@
 
     <niobject name="NiMaterialProperty" inherit="NiProperty">
         Describes the surface properties of an object e.g. translucency, ambient color, diffuse color, emissive color, and specular color.
-        <add name="Flags" type="Flags" ver1="3.0" ver2="10.0.1.2">Property flags.</add>
+        <add name="Flags" type="ushort" ver1="3.0" ver2="10.0.1.2">Property flags.</add>
         <add name="Ambient Color" type="Color3" default="#VEC3_ONE#" vercond="#BSVER# #LT# 26">How much the material reflects ambient light.</add>
         <add name="Diffuse Color" type="Color3" default="#VEC3_ONE#" vercond="#BSVER# #LT# 26">How much the material reflects diffuse light.</add>
         <add name="Specular Color" type="Color3" default="#VEC3_ONE#">How much light the material reflects in a specular manner.</add>
@@ -4528,9 +4602,7 @@
 
     <niobject name="NiShadeProperty" inherit="NiProperty">
         Determines whether flat shading or smooth shading is used on a shape.
-        <add name="Flags" type="Flags" default="1" vercond="#NI_BS_LTE_FO3#">
-            Bit 0: Enable smooth phong shading on this shape. Otherwise, hard-edged flat shading will be used on this shape.
-        </add>
+        <add name="Flags" type="ShadeFlags" default="SHADING_SMOOTH" vercond="#NI_BS_LTE_FO3#" />
     </niobject>
 
     <niobject name="NiSkinData" inherit="NiObject">
@@ -4597,7 +4669,7 @@
 
     <niobject name="NiSpecularProperty" inherit="NiProperty">
         Gives specularity to a shape. Flags 0x0001.
-        <add name="Flags" type="Flags">Bit 0 = Enable specular lighting on this shape.</add>
+        <add name="Flags" type="SpecularFlags" />
     </niobject>
 
     <niobject name="NiSphericalCollider" inherit="NiParticleModifier" until="V10_0_1_0">
@@ -4620,24 +4692,16 @@
 
     <niobject name="NiStencilProperty" inherit="NiProperty">
         Allows control of stencil testing.
-        <add name="Flags" type="Flags" ver2="10.0.1.2">Property flags.</add>
+        <add name="Flags" type="ushort" ver2="10.0.1.2">Property flags.</add>
         <add name="Stencil Enabled" type="byte" ver2="20.0.0.5">Enables or disables the stencil test.</add>
-        <add name="Stencil Function" type="StencilCompareMode" ver2="20.0.0.5">Selects the compare mode function (see: glStencilFunc).</add>
+        <add name="Stencil Function" type="StencilTestFunc" ver2="20.0.0.5">Selects the compare mode function (see: glStencilFunc).</add>
         <add name="Stencil Ref" type="uint" ver2="20.0.0.5" />
         <add name="Stencil Mask" type="uint" default="#UINT_MAX#" ver2="20.0.0.5">A bit mask. The default is 0xffffffff.</add>
         <add name="Fail Action" type="StencilAction" ver2="20.0.0.5" />
         <add name="Z Fail Action" type="StencilAction" ver2="20.0.0.5" />
         <add name="Pass Action" type="StencilAction" ver2="20.0.0.5" />
         <add name="Draw Mode" default="DRAW_BOTH" type="StencilDrawMode" ver2="20.0.0.5">Used to enabled double sided faces. Default is 3 (DRAW_BOTH).</add>
-        <add name="Flags" type="Flags" default="19840" ver1="20.1.0.3">
-            Property flags:
-            Bit 0: Stencil Enable
-            Bits 1-3: Fail Action
-            Bits 4-6: Z Fail Action
-            Bits 7-9: Pass Action
-            Bits 10-11: Draw Mode
-            Bits 12-14: Stencil Function
-        </add>
+        <add name="Flags" type="StencilFlags" default="19840" ver1="20.1.0.3" />
         <add name="Stencil Ref" type="uint" ver1="20.1.0.3" />
         <add name="Stencil Mask" type="uint" default="#UINT_MAX#" ver1="20.1.0.3">A bit mask. The default is 0xffffffff.</add>
     </niobject>
@@ -4686,7 +4750,7 @@
     <niobject name="NiTextureModeProperty" inherit="NiProperty" until="V10_0_1_0">
         LEGACY (pre-10.1)
         <add name="Unknown Ints" type="uint" arr1="3" ver2="2.3" />
-        <add name="Flags" type="short" ver1="3.0">Either 210 or 194.</add>
+        <add name="Flags" type="ushort" ver1="3.0">Either 210 or 194.</add>
         <add name="PS2 L" type="short" default="0" ver1="3.1" ver2="10.2.0.0" />
         <add name="PS2 K" type="short" default="-75" ver1="3.1" ver2="10.2.0.0" />
     </niobject>
@@ -4703,15 +4767,15 @@
     <niobject name="NiTextureProperty" inherit="NiProperty" until="V10_0_1_0">
         LEGACY (pre-10.1)
         <add name="Unknown Ints 1" type="uint" arr1="2" ver2="2.3" />
-        <add name="Flags" type="Flags" ver1="3.0">Property flags.</add>
+        <add name="Flags" type="ushort" ver1="3.0">Property flags.</add>
         <add name="Image" type="Ref" template="NiImage">Link to the texture image.</add>
         <add name="Unknown Ints 2" type="uint" arr1="2" ver1="3.0" ver2="3.03" />
     </niobject>
 
     <niobject name="NiTexturingProperty" inherit="NiProperty">
         Describes how a fragment shader should be configured for a given piece of geometry.
-        <add name="Flags" type="Flags" ver2="10.0.1.2">Property flags.</add>
-        <add name="Flags" type="Flags" ver1="20.1.0.2">Property flags.</add>
+        <add name="Flags" type="ushort" ver2="10.0.1.2">Property flags.</add>
+        <add name="Flags" type="TexturingFlags" ver1="20.1.0.2">Property flags.</add>
         <add name="Apply Mode" type="ApplyMode" default="APPLY_MODULATE" ver1="3.3.0.13" ver2="20.1.0.1">Determines how the texture will be applied.  Seems to have special functions in Oblivion.</add>
         <add name="Texture Count" type="uint" default="7">Number of textures.</add>
         <add name="Has Base Texture" type="bool" />
@@ -4877,13 +4941,9 @@
 
     <niobject name="NiVertexColorProperty" inherit="NiProperty">
         Property of vertex colors. This object is referred to by the root object of the NIF file whenever some NiTriShapeData object has vertex colors with non-default settings; if not present, vertex colors have vertex_mode=2 and lighting_mode=1.
-        <add name="Flags" type="Flags">
-            Bits 0-2: Unknown
-            Bit 3: Lighting Mode
-            Bits 4-5: Vertex Mode
-        </add>
-        <add name="Vertex Mode" type="VertMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</add>
-        <add name="Lighting Mode" type="LightMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</add>
+        <add name="Flags" type="VertexColorFlags" />
+        <add name="Vertex Mode" type="SourceVertexMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</add>
+        <add name="Lighting Mode" type="LightingMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</add>
     </niobject>
 
     <niobject name="NiVertWeightsExtraData" inherit="NiExtraData">
@@ -4903,20 +4963,13 @@
 
     <niobject name="NiWireframeProperty" inherit="NiProperty">
         Allows applications to switch between drawing solid geometry or wireframe outlines.
-        <add name="Flags" type="Flags">
-            Property flags.
-            0 - Wireframe Mode Disabled
-            1 - Wireframe Mode Enabled
-        </add>
+        <add name="Flags" type="WireframeFlags" />
     </niobject>
 
     <niobject name="NiZBufferProperty" inherit="NiProperty">
         Allows applications to set the test and write modes of the renderer's Z-buffer and to set the comparison function used for the Z-buffer test.
-        <add name="Flags" type="Flags" default="3">
-            Bit 0 enables the z test
-            Bit 1 controls wether the Z buffer is read only (0) or read/write (1)
-        </add>
-        <add name="Function" type="ZCompareMode" default="ZCOMP_LESS_EQUAL" ver1="4.1.0.12" ver2="20.0.0.5">
+        <add name="Flags" type="ZBufferFlags" default="3" />
+        <add name="Function" type="TestFunction" default="TEST_LESS_EQUAL" ver1="4.1.0.12" ver2="20.0.0.5">
             Z-Test function (see: glDepthFunc). In Flags from 20.1.0.3 on.
         </add>
     </niobject>

From 24b6ce04308bdf81dfc4275a66a92d2f8e9cf152 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sat, 16 Jun 2018 20:21:55 -0400
Subject: [PATCH 45/86] bhk cleanup, new primitives

Finally added bhkPlaneShape, used once in SSE.  Added bhkCylinderShape which is possible to export from the official FO4 exporter.

Cleaned up much of the class descriptions and also added `binary="true"` to the padding bytes.
---
 nif.xml | 70 ++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/nif.xml b/nif.xml
index 274b114..51dd90c 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2522,7 +2522,7 @@
 
     <niobject name="bhkSimpleShapePhantom" inherit="bhkShapePhantom" versions="#BETHESDA#">
         Unknown shape.
-        <add name="Unused 2" type="byte" arr1="8">Garbage data from memory.</add>
+        <add name="Unused 2" type="byte" arr1="8" binary="true">Garbage data from memory.</add>
         <add name="Transform" type="Matrix44" />
     </niobject>
 
@@ -2657,35 +2657,59 @@
     </niobject>
 
     <niobject name="bhkShape" abstract="1" inherit="bhkSerializable" versions="#BETHESDA#">
-        A Havok Shape?
+        The base class for narrowphase collision detection objects.
+        All narrowphase collision detection is performed between pairs of bhkShape objects by creating appropriate collision agents.
     </niobject>
 
     <niobject name="bhkTransformShape" inherit="bhkShape" versions="#BETHESDA#">
-        Transforms a shape.
+        Contains an bhkShape and an additional transform for that shape.
         <add name="Shape" type="Ref" template="bhkShape">The shape that this object transforms.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float" />
-        <add name="Unused" type="byte" arr1="8">Garbage data from memory.</add>
+        <add name="Unused" type="byte" arr1="8" binary="true">Garbage data from memory.</add>
         <add name="Transform" type="Matrix44">A transform matrix.</add>
     </niobject>
 
     <niobject name="bhkSphereRepShape" abstract="1" inherit="bhkShape" versions="#BETHESDA#">
-        A havok shape, perhaps with a bounding sphere for quick rejection in addition to more detailed shape data?
+        An interface that produces a set of spheres that represent a simplified version of the shape.
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
-        <add name="Radius" type="float">The radius of the sphere that encloses the shape.</add>
     </niobject>
 
     <niobject name="bhkConvexShape" abstract="1" inherit="bhkSphereRepShape" versions="#BETHESDA#">
-        A havok shape.
+        An interface that allows testing convex sets using the GJK algorithm. Also holds a radius value for creating a shell.
+        <add name="Radius" type="float" default="0.05">The radius is used to create a thin shell that is used as the shape surface.</add>
+    </niobject>
+
+    <niobject name="bhkHeightFieldShape" inherit="bhkShape" abstract="1" versions="#BETHESDA#">
+        An interface for a shape which can collide with an array of spheres.
+        <add name="Material" type="HavokMaterial">The material of the shape.</add>
+    </niobject>
+
+    <niobject name="bhkPlaneShape" inherit="bhkHeightFieldShape" versions="#BETHESDA#">
+        Contains a normal and distance from the origin, bounded by a given AABB.
+        <add name="Unused" type="byte" arr1="12" binary="true">Not used. The following wants to be aligned at 16 bytes.</add>
+        <add name="Plane Normal" type="Vector3" />
+        <add name="Plane Constant" type="float">Distance from the origin to the plane.</add>
+        <add name="AABB Half Extents" type="Vector4" />
+        <add name="AABB Center" type="Vector4" />
     </niobject>
 
     <niobject name="bhkSphereShape" inherit="bhkConvexShape" versions="#BETHESDA#">
         A sphere.
     </niobject>
 
+    <niobject name="bhkCylinderShape" inherit="bhkConvexShape" versions="#BETHESDA#">
+        A cylinder.
+        <add name="Unused" type="byte" arr1="8" binary="true">Not used. The following wants to be aligned at 16 bytes.</add>
+        <add name="Vertex A" type="Vector4" />
+        <add name="Vertex B" type="Vector4" />
+        <add name="Cylinder Radius" type="float" />
+        <add name="Unused 2" type="byte" arr1="12" binary="true">Not used. The block is padded to 16 bytes.</add>
+    </niobject>
+
     <niobject name="bhkCapsuleShape" inherit="bhkConvexShape" versions="#BETHESDA#">
         A capsule.
-        <add name="Unused" type="byte" arr1="8">Not used. The following wants to be aligned at 16 bytes.</add>
+        <add name="Unused" type="byte" arr1="8" binary="true">Not used. The following wants to be aligned at 16 bytes.</add>
         <add name="First Point" type="Vector3">First point on the capsule's axis.</add>
         <add name="Radius 1" type="float">Matches first capsule radius.</add>
         <add name="Second Point" type="Vector3">Second point on the capsule's axis.</add>
@@ -2694,7 +2718,7 @@
 
     <niobject name="bhkBoxShape" inherit="bhkConvexShape" versions="#BETHESDA#">
         A box.
-        <add name="Unused" type="byte" arr1="8">Not used. The following wants to be aligned at 16 bytes.</add>
+        <add name="Unused" type="byte" arr1="8" binary="true">Not used. The following wants to be aligned at 16 bytes.</add>
         <add name="Dimensions" type="Vector3">A cube stored in Half Extents. A unit cube (1.0, 1.0, 1.0) would be stored as 0.5, 0.5, 0.5.</add>
         <add name="Unused Float" type="float">Unused as Havok stores the Half Extents as hkVector4 with the W component unused.</add>
     </niobject>
@@ -2711,9 +2735,9 @@
         <add name="Normals" type="Vector4" arr1="Num Normals">Half spaces as determined by the set of vertices above. First three components define the normal pointing to the exterior, fourth component is the signed distance of the separating plane to the origin: it is minus the dot product of v and n, where v is any vertex on the separating plane, and n is the normal. Lexicographically sorted.</add>
     </niobject>
 
-    <!--Should inherit from bhkConvexShape according to hierarchy, but seems to be exactly the same as bhkTransformShape.-->
     <niobject name="bhkConvexTransformShape" inherit="bhkTransformShape" versions="#BETHESDA#">
-        A convex transformed shape?
+        Contains a bhkShape and an additional transform for that shape.
+        The advantage of using bhkConvexTransformShape over bhkTransformShape is that it does not require additional agents to be created as it is itself convex.
     </niobject>
 
     <niobject name="bhkConvexSweepShape" inherit="bhkShape" versions="V10_0_1_0">
@@ -2724,7 +2748,11 @@
     </niobject>
 
     <niobject name="bhkMultiSphereShape" inherit="bhkSphereRepShape" versions="#BETHESDA#">
-        Unknown.
+        A compound shape made up of spheres. This is useful as an approximation for complex shapes, as collision detection for spheres is very fast.
+        However, if two bhkMultiSphereShape collide, every sphere needs to be checked against every other sphere.
+            Example: 10 spheres colliding with 10 spheres will result in 100 collision checks.
+            Therefore shapes like bhkCapsuleShape or bhkConvexVerticesShape should be preferred.
+        <add name="Radius" type="float">The radius of the sphere that encloses the shape.</add>
         <add name="Unknown Float 1" type="float" />
         <add name="Unknown Float 2" type="float" />
         <add name="Num Spheres" type="uint">The number of spheres in this multi sphere shape.</add>
@@ -2732,7 +2760,8 @@
     </niobject>
 
     <niobject name="bhkBvTreeShape" abstract="1" inherit="bhkShape" versions="#BETHESDA#">
-        A tree-like Havok data structure stored in an assembly-like binary code?
+        Adds bounding volume tree information to an shape collection.
+        A bounding volume tree is useful for testing collision between a moving object and large static geometry.
     </niobject>
 
     <niobject name="bhkMoppBvTreeShape" inherit="bhkBvTreeShape" versions="#BETHESDA#">
@@ -2749,7 +2778,7 @@
 
 
     <niobject name="bhkShapeCollection" abstract="1" inherit="bhkShape" versions="#BETHESDA#">
-        Havok collision object that uses multiple shapes?
+        An interface to a collection of bhkShapes.
     </niobject>
 
     <niobject name="bhkListShape" inherit="bhkShapeCollection" versions="#BETHESDA#">
@@ -2769,18 +2798,13 @@
         <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" />
     </niobject>
 
-    <!--
-    bhkMeshShape appears in some old Oblivion nifs, for instance
-    meshes/architecture/basementsections/ungrdltraphingedoor.nif 
-    but only in some distributions of Oblivion
-
-    XXX not completely decoded, also the 4 dummy separator bytes seem
-    to be missing from nifs that have this block
-    -->
     <niobject name="bhkMeshShape" inherit="bhkShape" versions="V10_0_1_0">
+        bhkMeshShape appears in some old Oblivion nifs, for instance
+        meshes/architecture/basementsections/ungrdltraphingedoor.nif 
+        but only in some distributions of Oblivion
         <add name="Unknowns" type="uint" arr1="2" />
         <add name="Radius" type="float" />
-        <add name="Unused 2" type="byte" arr1="8" />
+        <add name="Unused 2" type="byte" arr1="8" binary="true" />
         <add name="Scale" type="Vector4" />
         <add name="Num Shape Properties" type="uint" />
         <add name="Shape Properties" type="hkWorldObjCinfoProperty" arr1="Num Shape Properties" />

From a58bd61367714f681bfc4d23e91cd99ef26345ac Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sat, 16 Jun 2018 20:26:56 -0400
Subject: [PATCH 46/86] Clean up and remove unnecessary XML comments

Try to use element text whenever possible, and remove any unnecessary XML comments.  Soon the XML will be regenerated and so the XML comments need to be well formed and in predictable locations.
---
 nif.xml | 139 ++++++++++++++++++++------------------------------------
 1 file changed, 50 insertions(+), 89 deletions(-)

diff --git a/nif.xml b/nif.xml
index 51dd90c..e279d4c 100644
--- a/nif.xml
+++ b/nif.xml
@@ -898,7 +898,6 @@
         <option value="2" name="RIGID_FACE_CAMERA">Align billboard and camera forward vector. Non-minimized rotation.</option>
         <option value="3" name="ALWAYS_FACE_CENTER">Billboard forward vector always faces camera ceneter. Minimized rotation.</option>
         <option value="4" name="RIGID_FACE_CENTER">Billboard forward vector always faces camera ceneter. Non-minimized rotation.</option>
-        <!-- TODO: Unverified -->
         <option value="5" name="BSROTATE_ABOUT_UP">The billboard will only rotate around its local Z axis (it always stays in its local X-Y plane).</option>
         <option value="9" name="ROTATE_ABOUT_UP2">The billboard will only rotate around the up axis (same as ROTATE_ABOUT_UP?).</option>
     </enum>
@@ -1323,7 +1322,6 @@
         <option value="6" name="Prismatic">A prismatic constraint.</option>
         <option value="7" name="Ragdoll">A ragdoll constraint.</option>
         <option value="8" name="StiffSpring">A stiff spring constraint.</option>
-        <!--<option value="10" name="Generic">A generic constraint.</option>-->
         <option value="13" name="Malleable">A malleable constraint.</option>
     </enum>
 
@@ -1691,10 +1689,8 @@
         <add name="Controller" type="Ref" template="NiTimeController" ver2="20.5.0.0" />
         <add name="Blend Interpolator" type="Ref" template="NiBlendInterpolator" ver1="10.1.0.104" ver2="10.1.0.110" />
         <add name="Blend Index" type="ushort" ver1="10.1.0.104" ver2="10.1.0.110" />
-        <!-- Bethesda-only -->
         <add name="Priority" type="byte" ver1="10.1.0.106" vercond="#BSSTREAM#">Idle animations tend to have low values for this, and high values tend to correspond with the important parts of the animations.</add>
         <!-- NiControllerSequence::IDTag, post-10.1.0.104 only -->
-        <!-- Until 10.2 -->
         <add name="Node Name" type="string" ver1="10.1.0.104" ver2="10.1.0.113">The name of the animated NiAVObject.</add>
         <add name="Property Type" type="string" ver1="10.1.0.104" ver2="10.1.0.113">The RTTI type of the NiProperty the controller is attached to, if applicable.</add>
         <add name="Controller Type" type="string" ver1="10.1.0.104" ver2="10.1.0.113">The RTTI type of the NiTimeController.</add>
@@ -1775,8 +1771,8 @@
         <add name="Keys" type="Key" arg="Interpolation" template="#T#" arr1="Num Keys">The keys.</add>
     </compound>
 
-    <compound name="QuatKey" istemplate="1"><!-- #T# should always be Quaternion -->
-        A special version of the key type used for quaternions.  Never has tangents.
+    <compound name="QuatKey" istemplate="1">
+        A special version of the key type used for quaternions. Never has tangents. #T# should always be Quaternion.
         <add name="Time" type="float" ver2="10.1.0.0">Time the key applies.</add>
         <add name="Time" type="float" cond="#ARG# != 4" ver1="10.1.0.106">Time the key applies.</add>
         <add name="Value" type="#T#" cond="#ARG# != 4">Value of the key.</add>
@@ -1839,19 +1835,19 @@
     </compound>
 	
 	<bitflags name="VertexFlags" storage="ushort" prefix="VF" versions="#SSE# #FO4#">
-		<!-- First 4 bits are unused -->
-		<option value="4" name="Vertex" />          <!-- & 16 -->
-		<option value="5" name="UVs" />             <!-- & 32 -->
-		<option value="6" name="UVs_2" />           <!-- & 64 -->
-		<option value="7" name="Normals" />         <!-- & 128 -->
-		<option value="8" name="Tangents" />        <!-- & 256 -->
-		<option value="9" name="Vertex_Colors" />   <!-- & 512 -->
-		<option value="10" name="Skinned" />        <!-- & 1024 -->
-		<option value="11" name="Land_Data" />      <!-- & 2048 -->
-		<option value="12" name="Eye_Data" />       <!-- & 4096 -->
-		<option value="13" name="Instance" />       <!-- & 8192 -->
-		<option value="14" name="Full_Precision" /> <!-- & 16384 -->
-		<!-- Last bit unused -->
+		The two bytes of BSVertexDesc that describe the enabled vertex attributes.
+		The first 4 bits are skipped and the last bit is unused.
+		<option value="4" name="Vertex" />
+		<option value="5" name="UVs" />
+		<option value="6" name="UVs_2" />
+		<option value="7" name="Normals" />
+		<option value="8" name="Tangents" />
+		<option value="9" name="Vertex_Colors" />
+		<option value="10" name="Skinned" />
+		<option value="11" name="Land_Data" />
+		<option value="12" name="Eye_Data" />
+		<option value="13" name="Instance" />
+		<option value="14" name="Full_Precision" />
 	</bitflags>
     
 	<compound name="BSVertexData" versions="#SSE# #FO4#">
@@ -2001,7 +1997,7 @@
         <add name="Num Keys" type="uint" ver2="10.1.0.0">The number of morph keys that follow.</add>
         <add name="Interpolation" type="KeyType" ver2="10.1.0.0">Unlike most objects, the presense of this value is not conditional on there being keys.</add>
         <add name="Keys" type="Key" arg="Interpolation" template="float" arr1="Num Keys" ver2="10.1.0.0">The morph key frames.</add>
-        <add name="Legacy Weight" type="float" ver1="10.1.0.104" ver2="20.1.0.2" vercond="#BSVER# #LT# 10" /> <!-- Exclude Bethesda -->
+        <add name="Legacy Weight" type="float" ver1="10.1.0.104" ver2="20.1.0.2" vercond="#BSVER# #LT# 10" />
         <add name="Vectors" type="Vector3" arr1="#ARG#">Morph vectors.</add>
     </compound>
 
@@ -2171,8 +2167,8 @@
         <add name="Axis B" type="Vector4" vercond="#NI_BS_LTE_16#">Axis A in second entity coordinate system.</add>
         <add name="Perp Axis In B2" type="Vector4" vercond="#NI_BS_LTE_16#">Perp Axis In A2 in second entity coordinate system.</add>
 
-        <!-- Fallout 3 and later, Havok 660 and 2010 -->
-        <!-- In reality Havok loads these as Transform A and Transform B using hkTransform -->
+        <!-- Fallout 3 and later, Havok 660 and 2010
+             In reality Havok loads these as Transform A and Transform B using hkTransform -->
         <add name="Axis A" type="Vector4" vercond="!#NI_BS_LTE_16#">Axis of rotation.</add>
         <add name="Perp Axis In A1" type="Vector4" vercond="!#NI_BS_LTE_16#">Vector in the rotation plane which defines the zero angle.</add>
         <add name="Perp Axis In A2" type="Vector4" vercond="!#NI_BS_LTE_16#">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</add>
@@ -2207,8 +2203,6 @@
         <add name="Perp Axis In B1" type="Vector4" ver1="20.2.0.7">Perp Axis In A1 in second entity coordinate system.</add>
         <add name="Perp Axis In B2" type="Vector4" ver1="20.2.0.7">Perp Axis In A2 in second entity coordinate system.</add>
         <add name="Pivot B" type="Vector4" ver1="20.2.0.7">Pivot A in second entity coordinate system.</add>
-
-        <!-- no friction -->
     </compound>
 
     <compound name="BallAndSocketDescriptor" size="32" versions="#BETHESDA#">
@@ -2227,8 +2221,8 @@
         <add name="Rotation B" type="Vector4" ver2="20.0.0.5">Rotation axis.</add>
         <add name="Plane B" type="Vector4" ver2="20.0.0.5">Plane normal. Describes the plane the object is able to move on in B coordinates.</add>
         
-        <!-- Fallout 3 and later, Havok 660 and 2010 -->
-        <!-- In reality Havok loads these as Transform A and Transform B using hkTransform -->
+        <!-- Fallout 3 and later, Havok 660 and 2010
+             In reality Havok loads these as Transform A and Transform B using hkTransform -->
         <add name="Sliding A" type="Vector4" ver1="20.2.0.7">Describes the axis the object is able to travel along. Unit vector.</add>
         <add name="Rotation A" type="Vector4" ver1="20.2.0.7">Rotation axis.</add>
         <add name="Plane A" type="Vector4" ver1="20.2.0.7">Plane normal. Describes the plane the object is able to move on.</add>
@@ -2390,9 +2384,9 @@
         <add name="Prismatic" type="PrismaticDescriptor" cond="Type == 6" />
         <add name="Ragdoll" type="RagdollDescriptor" cond="Type == 7" />
         <add name="Stiff Spring" type="StiffSpringDescriptor" cond="Type == 8" />
-        <add name="Tau" type="float" ver2="20.0.0.5" /><!-- not in Fallout 3 or Skyrim -->
-        <add name="Damping" type="float" ver2="20.0.0.5" /><!-- In TES CS described as Damping -->
-        <add name="Strength" type="float" ver1="20.2.0.7" /><!-- In GECK and Creation Kit described as Strength -->
+        <add name="Tau" type="float" ver2="20.0.0.5" />
+        <add name="Damping" type="float" ver2="20.0.0.5" />
+        <add name="Strength" type="float" ver1="20.2.0.7" />
     </compound>
 
     <compound name="ConstraintData" versions="#BETHESDA#">
@@ -2943,7 +2937,7 @@
         <add name="Next High Weights Sum" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
         <add name="High Ease Spinner" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
         <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <!-- end Flags 1 conds -->
+        <!-- /Flags conds -->
         <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" ver2="10.1.0.111" />
         <add name="Managed Controlled" type="bool" ver2="10.1.0.111" />
         <add name="Weight Threshold" type="float" ver2="10.1.0.111" />
@@ -3007,15 +3001,12 @@
     <bitflags name="bhkCOFlags" storage="ushort" prefix="BHKCO" versions="#BETHESDA#">
         bhkNiCollisionObject flags. The flags 0x2, 0x100, and 0x200 are not seen in any NIF nor get/set by the engine.
         <option value="0" name="ACTIVE" />
-        <!--<option value="1" name="UNK1" />-->
         <option value="2" name="NOTIFY" />
         <option value="3" name="SET_LOCAL" />
         <option value="4" name="DBG_DISPLAY" />
         <option value="5" name="USE_VEL" />
         <option value="6" name="RESET" />
         <option value="7" name="SYNC_ON_UPDATE" />
-        <!--<option value="8" name="UNK2" />-->
-        <!--<option value="9" name="UNK3" />-->
         <option value="10" name="ANIM_TARGETED" />
         <option value="11" name="DISMEMBERED_LIMB" />
     </bitflags>
@@ -3369,30 +3360,25 @@
         <add name="Material Name" type="string" arr1="Num Materials" ver1="20.2.0.5">The name of the material.</add>
         <add name="Material Extra Data" type="int" arr1="Num Materials" ver1="20.2.0.5">Extra data associated with the material. A value of -1 means the material is the default implementation.</add>
         <add name="Active Material" type="int" default="-1" ver1="20.2.0.5">The index of the currently active material.</add>
-        <!-- Custom Versions -->
         <add name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" vercond="#USER# == 1">Cyanide extension (Blood Bowl).</add>
         <add name="WorldShift Unknown" type="int" ver1="10.3.0.1" ver2="10.4.0.1" />
-        <!-- / Custom -->
         <add name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</add>
     </compound>
 
     <niobject name="NiGeometry" abstract="1" inherit="NiAVObject">
         Describes a visible scene element with vertices like a mesh, a particle system, lines, etc.
-        <!-- Bethesda 20.2.0.7 NIFs: NiGeometry was changed to BSGeometry. 
-             Most new blocks (e.g. BSTriShape) do not refer to NiGeometry except NiParticleSystem was changed to use BSGeometry.
-             This causes massive inheritance problems so the rows below are doubled up to exclude NiParticleSystem for Bethesda Stream 100+.
-        -->
-        <!-- BSGeometry: Used by Bethesda Stream 100+ NiParticleSystem -->
+            Bethesda 20.2.0.7 NIFs: NiGeometry was changed to BSGeometry. 
+            Most new blocks (e.g. BSTriShape) do not refer to NiGeometry except NiParticleSystem was changed to use BSGeometry.
+            This causes massive inheritance problems so the rows below are doubled up to exclude NiParticleSystem for Bethesda Stream 100+
+            and to add data exclusive to BSGeometry.
         <add name="Bound" type="NiBound" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
         <add name="Skin" type="Ref" template="NiObject" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
-        <!-- NiGeometry: Each row is doubled in order to exclude NiParticleSystem for Bethesda Stream 100+ -->
         <add name="Data" type="Ref" template="NiGeometryData" vercond="#NI_BS_LT_SSE#">Data index (NiTriShapeData/NiTriStripData).</add>
         <add name="Data" type="Ref" template="NiGeometryData" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</add>
         <add name="Skin Instance" type="Ref" template="NiSkinInstance" ver1="3.3.0.13" vercond="#NI_BS_LT_SSE#" />
         <add name="Skin Instance" type="Ref" template="NiSkinInstance" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
         <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#NI_BS_LT_SSE#" />
         <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
-        <!-- Bethesda -->
         <add name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
         <add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
     </niobject>
@@ -3441,10 +3427,10 @@
 
     <niobject name="NiGeometryData" abstract="1" inherit="NiObject">
         Mesh data: vertices, vertex normals, etc.
-        <!-- Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly. 
-           "Num Vertices" is renamed to "BS Max Vertices" for Bethesda 20.2 because Vertices, Normals, Tangents, Colors, and UV arrays
-           do not have length for NiPSysData regardless of "Num" or booleans.
-        -->
+            Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly. 
+            "Num Vertices" is renamed to "BS Max Vertices" for Bethesda 20.2 because Vertices, Normals, Tangents, Colors, and UV arrays
+            do not have length for NiPSysData regardless of "Num" or booleans.
+
         <add name="Group ID" type="int" ver1="10.1.0.114">Always zero.</add>
         <add name="Num Vertices" type="ushort" excludeT="NiPSysData">Number of vertices.</add>
         <add name="Num Vertices" type="ushort" onlyT="NiPSysData" vercond="#NI_BS_LT_FO3#">Number of vertices.</add>
@@ -3560,7 +3546,7 @@
         <add name="Rotation Angles" type="float" arr1="Num Vertices" cond="Has Rotation Angles" vercond="!#BS202#">Angles of rotation</add>
         <add name="Has Rotation Axes" type="bool" ver1="20.0.0.4">Are axes of rotation present?</add>
         <add name="Rotation Axes" type="Vector3" arr1="Num Vertices" cond="Has Rotation Axes" ver1="20.0.0.4" vercond="!#BS202#">Axes of rotation.</add>
-        <!-- Bethesda -->
+
         <add name="Has Texture Indices" type="bool" vercond="#BS202#" />
         <add name="Num Subtexture Offsets" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#">How many quads to use in BSPSysSubTexModifier for texture atlasing</add>
         <add name="Num Subtexture Offsets" type="byte" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BSSTREAM# #AND# #NI_BS_LTE_FO3#">2,4,8,16,32,64 are potential values. If "Has" was no then this should be 256, which represents a 16x16 framed image, which is invalid</add>
@@ -3781,7 +3767,8 @@
         <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver1="10.1.0.106" />
         <add name="Cycle Type" type="CycleType" ver1="10.1.0.106" />
         <add name="Frequency" type="float" default="1.0" ver1="10.1.0.106" />
-        <add name="Phase" type="float" ver1="10.1.0.106" ver2="10.4.0.1" /> <!-- Actually ver2="10.3.0.1" but WorldShift 10.4.0.1 custom version acts like 10.3.0.1 -->
+        <!-- Actually 10.3.0.1 but WorldShift 10.4.0.1 custom version acts like 10.3.0.1 -->
+        <add name="Phase" type="float" ver1="10.1.0.106" ver2="10.4.0.1" />
         <add name="Start Time" type="float" default="#FLT_MAX#" ver1="10.1.0.106" />
         <add name="Stop Time" type="float" default="#FLT_MIN#" ver1="10.1.0.106" />
         <add name="Play Backwards" type="bool" ver1="10.1.0.106" ver2="10.1.0.106" />
@@ -3789,7 +3776,6 @@
         <add name="Accum Root Name" type="string" ver1="10.1.0.106">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
         <add name="Accum Flags" type="AccumFlags" ver1="20.3.0.8" default="ACCUM_X_FRONT" />
         <add name="String Palette" type="Ref" template="NiStringPalette" ver1="10.1.0.113" ver2="20.1.0.0" />
-        <!-- Bethesda -->
         <add name="Anim Notes" type="Ref" template="BSAnimNotes" ver1="20.2.0.7" vercond="(#BSVER# #GTE# 24) #AND# (#BSVER# #LTE# 28)" />
         <add name="Num Anim Note Arrays" type="ushort" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
         <add name="Anim Note Arrays" type="Ref" template="BSAnimNotes" arr1="Num Anim Note Arrays" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
@@ -4035,7 +4021,7 @@
 
     <niobject name="NiPalette" inherit="NiObject">
         NiPalette objects represent mappings from 8-bit indices to 24-bit RGB or 32-bit RGBA colors.
-        <add name="Has Alpha" type="byte" /> <!-- Not bool as always 8-bit -->
+        <add name="Has Alpha" type="byte">Not boolean but used as one, always 8-bit.</add>
         <add name="Num Entries" type="uint" default="256">The number of palette entries. Always 256 but can also be 16.</add>
         <add name="Palette" type="ByteColor4" arr1="16" cond="Num Entries == 16">The color palette.</add>
         <add name="Palette" type="ByteColor4" arr1="256" cond="Num Entries != 16">The color palette.</add>
@@ -4188,12 +4174,10 @@
         <add name="Is Signed" type="bool" />
     </compound>
 
-    <!--
+    <niobject name="NiPixelFormat" abstract="1" inherit="NiObject">
         NiPixelFormat is not the parent to NiPixelData/NiPersistentSrcTextureRendererData,
         but actually a member class loaded at the top of each. The two classes are not related.
-        However, faking this inheritance is useful for several things.    
-    -->
-    <niobject name="NiPixelFormat" abstract="1" inherit="NiObject">
+        However, faking this inheritance is useful for several things.
         <add name="Pixel Format" type="PixelFormat">The format of the pixels in this internally stored image.</add>
         <!-- Technically since 10.3.0.3, fudging for WorldShift custom version as no games have official 10.3 NIFs anyway. -->
         <add name="Red Mask" type="uint" ver2="10.4.0.1">0x000000ff (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</add>
@@ -4454,8 +4438,8 @@
         <add name="Life Span Variation" type="float">The amount the lifespan can vary.</add>
     </niobject>
 
-    <!-- WorldShift -->
     <niobject name="NiPSysPartSpawnModifier" inherit="NiPSysModifier" versions="V10_2_0_1 V10_3_0_1 V10_4_0_1">
+        WorldShift-specific Particle Spawn modifier
         <add name="Unknown Float 1" type="float" />
         <add name="Unknown Float 2" type="float" />
         <add name="Spawner" type="Ref" template="NiPSysSpawnModifier" />
@@ -4764,7 +4748,7 @@
         <add name="Coordinate Generation Type" default="CG_SPHERE_MAP" type="CoordGenType">The method that will be used to generate UV coordinates for the texture effect.</add>
         <add name="Image" type="Ref" template="NiImage" ver2="3.1">Image index.</add>
         <add name="Source Texture" type="Ref" template="NiSourceTexture" ver1="3.1">Source texture index.</add>
-        <add name="Enable Plane" default="0" type="byte">Determines whether a clipping plane is used.</add> <!-- Not bool as always 8-bit -->
+        <add name="Enable Plane" default="0" type="byte">Determines whether a clipping plane is used. Always 8-bit.</add>
         <add name="Plane" type="NiPlane" />
         <add name="PS2 L" type="short" default="0" ver2="10.2.0.0" />
         <add name="PS2 K" type="short" default="-75" ver2="10.2.0.0" />
@@ -5544,8 +5528,7 @@
         <add name="Num Out Portals" type="uint" />
         <add name="Out Portals" type="Ptr" template="NiPortal" arr1="Num Out Portals">The portals which see out of the room.</add>
         <add name="Num Fixtures" type="uint" />
-        <!-- May actually be Ref, at least for legacy -->
-        <add name="Fixtures" type="Ptr" template="NiAVObject" arr1="Num Fixtures">All geometry associated with the room.</add>
+        <add name="Fixtures" type="Ptr" template="NiAVObject" arr1="Num Fixtures">All geometry associated with the room. Seems to be Ref for legacy.</add>
     </niobject>
 
     <niobject name="NiPortal" inherit="NiAVObject">
@@ -5679,7 +5662,6 @@
         <add name="Emissive Color" type="Color4" vercond="#BS_GT_FO3#">Glow color and alpha</add>
     </niobject>
 
-    <!-- Skyrim specific Node -->
     <niobject name="BSEffectShaderPropertyFloatController" inherit="NiFloatInterpController" versions="#SKY_AND_LATER#">
         This controller is used to animate float variables in BSEffectShaderProperty.
         <add name="Type of Controlled Variable" type="EffectShaderControlledVariable">Which float variable in BSEffectShaderProperty to animate:</add>
@@ -5994,12 +5976,11 @@
         <add name="UV Offset" type="TexCoord">Offset UVs</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures</add>
         <add name="Source Texture"  type="SizedString">points to an external texture.</add>
-        <!-- TODO: Requires bitfield, read as single int -->
+        <!-- TODO: Next 4 bytes requires bitfield, read as single int -->
         <add name="Texture Clamp Mode" type="byte">How to handle texture borders.</add>
         <add name="Lighting Influence" type="byte" />
         <add name="Env Map Min LOD" type="byte" />
         <add name="Unused Byte" type="byte" />
-        <!-- /bitfield -->
         <add name="Falloff Start Angle" type="float" default="1.0">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
         <add name="Falloff Stop Angle" type="float" default="1.0">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
         <add name="Falloff Start Opacity" type="float">Alpha falloff multiplier at start angle</add>
@@ -6339,8 +6320,8 @@
         <add name="Blocks" type="AdditionalDataBlock" arr1="Num Blocks">Number of additional data blocks</add>
     </niobject>
 
-    <!-- Fallout NV (nvdlc01vaultposter01.nif) -->
     <niobject name="BSPackedAdditionalGeometryData" inherit="AbstractAdditionalGeometryData" versions="#BETHESDA#">
+        No longer appears to occur in any vanilla files. Older versions of FNV had the block in nvdlc01vaultposter01.nif.
         <add name="Num Vertices" type="ushort" />
         <add name="Num Block Infos" type="uint">Information about additional data blocks</add>
         <add name="Block Infos" type="AdditionalDataInfo" arr1="Num Block Infos">Number of additional data blocks</add>
@@ -6544,22 +6525,10 @@
     </compound>
 
     <compound name="DataStreamRef" since="V20_5_0_0">
-        <add name="Stream" type="Ref" template="NiDataStream">
-            Reference to a data stream object which holds the data used by
-            this reference.
-        </add>
-        <add name="Is Per Instance" type="bool" default="0">
-            Sets whether this stream data is per-instance data for use in
-            hardware instancing.
-        </add>
-        <add name="Num Submeshes" type="ushort" default="1">
-            The number of submesh-to-region mappings that this data stream
-            has.
-        </add>
-        <add name="Submesh To Region Map" type="ushort" arr1="Num Submeshes">
-            <!-- see Zorsis Zombie_Boy.nif -->
-            A lookup table that maps submeshes to regions.
-        </add>
+        <add name="Stream" type="Ref" template="NiDataStream">Reference to a data stream object which holds the data used by this reference.</add>
+        <add name="Is Per Instance" type="bool" default="0">Sets whether this stream data is per-instance data for use in hardware instancing.</add>
+        <add name="Num Submeshes" type="ushort" default="1">The number of submesh-to-region mappings that this data stream has.</add>
+        <add name="Submesh To Region Map" type="ushort" arr1="Num Submeshes">A lookup table that maps submeshes to regions.</add>
         <add name="Num Components" type="uint" default="1" />
         <add name="Component Semantics" type="SemanticData" arr1="Num Components">Describes the semantic of each component.</add>
     </compound>
@@ -6641,7 +6610,6 @@
 
     <niobject name="NiMesh" inherit="NiRenderObject" since="V20_5_0_0">
         <add name="Primitive Type" type="MeshPrimitiveType">The primitive type of the mesh, such as triangles or lines.</add>
-        <!-- Epic Mickey -->
         <add name="EM Data" type="MeshDataEpicMickey" ver1="20.6.5.0" ver2="20.6.5.0" />
         <add name="Num Submeshes" type="ushort">The number of submeshes contained in this mesh.</add>
         <add name="Instancing Enabled" type="bool">Sets whether hardware instancing is being used.</add>
@@ -6650,7 +6618,6 @@
         <add name="Datastreams" type="DataStreamRef" arr1="Num Datastreams" />
         <add name="Num Modifiers" type="uint" />
         <add name="Modifiers" type="Ref" template="NiMeshModifier" arr1="Num Modifiers" />
-        <!-- Epic Mickey -->
         <add name="Has Extra EM Data" type="bool" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 9" />
         <add name="Extra EM Data" type="ExtraMeshDataEpicMickey" cond="Has Extra EM Data" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 9" />
     </niobject>
@@ -6773,7 +6740,6 @@
         <add name="Num Spawn Rate Keys" type="byte" ver1="20.6.1.0" />
         <add name="Spawn Rate Keys" type="PSSpawnRateKey" arr1="Num Spawn Rate Keys" ver1="20.6.1.0" />
         <add name="Pre RPI" type="bool" ver1="20.6.1.0" />
-        <!-- Epic Mickey -->
         <add name="DEM Unknown Int" type="uint" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
         <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
@@ -6849,7 +6815,6 @@
         <add name="Shrink Time" type="float">The the amount of time over which a particle's size is ramped from 1.0 to 0.0 in seconds</add>
         <add name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</add>
         <add name="Shrink Generation" type="ushort">Specifies the particle generation to which the shrink effect should be applied. This is usually the highest supported generation for the particle system, so that particles will shrink immediately before getting killed.</add>
-        <!-- Epic Mickey -->
         <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
@@ -7009,7 +6974,6 @@
 
     <niobject name="NiPSVolumeEmitter" abstract="1" inherit="NiPSEmitter" since="V20_5_0_0">
         Abstract base class for particle emitters that emit particles from a volume.
-        <!-- Epic Mickey -->
         <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
         <add name="Emitter Object" type="Ptr" template="NiAVObject" />
     </niobject>
@@ -7286,7 +7250,7 @@
     </niobject>
 
     <niobject name="NiConstBoolEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
-        <add name="Value" type="float" default="#INV_FLT#" /> <!-- Yes, this is actually a float. -->
+        <add name="Value" type="float" default="#INV_FLT#">For floating point as boolean, 0.0 indicates false and 1.0 indicates true.</add>
     </niobject>
 
     <niobject name="NiConstColorEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
@@ -7382,12 +7346,11 @@
         Root node in Gamebryo .kf files (20.5.0.1 and up).
         For 20.5.0.0, "NiSequenceData" is an alias for "NiControllerSequence" and this is not handled in nifxml.
         This was not found in any 20.5.0.0 KFs available and they instead use NiControllerSequence directly.
+        After 20.5.0.1, Controlled Blocks are no longer used and instead the sequences uses NiEvaluator.
         <add name="Name" type="string" />
-        <!-- Pre-Evaluator -->
         <add name="Num Controlled Blocks" type="uint" ver2="20.5.0.1" />
         <add name="Array Grow By" type="uint" ver2="20.5.0.1" />
         <add name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" ver2="20.5.0.1" />
-        <!-- Evaluator -->
         <add name="Num Evaluators" type="uint" ver1="20.5.0.2" />
         <add name="Evaluators" type="Ref" template="NiEvaluator" arr1="Num Evaluators" ver1="20.5.0.2" />
         <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" />
@@ -7425,8 +7388,8 @@
         <add name="Bones 2" type="Ptr" template="NiNode" arr1="Num Bones 2">List of all armature bones.</add>
     </niobject>
 
-    <!-- Divinity 2 -->
     <niobject name="CStreamableAssetData" inherit="NiObject" versions="V20_3_0_9 V20_3_0_9_DIV2">
+        Divinity 2 specific block
         <add name="Root" type="Ref" template="NiNode" />
         <add name="Has Data" type="bool" />
         <add name="Data" type="ByteArray" cond="Has Data" />
@@ -7434,7 +7397,6 @@
         <add name="Refs" type="Ref" template="NiObject" arr1="Num Refs" />
     </niobject>
 
-    <!-- Skyrim specific havok block -->
     <niobject name="bhkCompressedMeshShape" inherit="bhkShape" versions="#SKY_AND_LATER#">
         Compressed collision mesh.
         <add name="Target" type="Ptr" template="NiAVObject">Points to root node?</add>
@@ -7478,7 +7440,6 @@
         <add name="Num Convex Piece A" type="uint">Does not appear to be used. Needs array.</add>
 	</niobject>
 	
-    <!-- Skyrim specific blocks -->
     <niobject name="BSInvMarker" inherit="NiExtraData" versions="#SKY_AND_LATER#">
     Orientation marker for Skyrim's inventory view.
         How to show the nif in the player's inventory.

From 83df1e5bf9d703126f8d3dbf1de4c2af201f393e Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sat, 16 Jun 2018 20:35:47 -0400
Subject: [PATCH 47/86] Improved NiAdditionalGeometryData

Named the compounds correctly after the actual structs,  separated the "Has Data" bool from the compound as it's not actually part of the struct, but before it in a for loop during (de)serialize.

Combined NiAdditionalGeometryData and the BS version into one compound when possible.  But the block can actually no longer be found in any official files, so the BS version is not very important.
---
 nif.xml | 81 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/nif.xml b/nif.xml
index e279d4c..0493e6a 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1433,6 +1433,18 @@
         <member width="3" pos="2" mask="0x003C" name="Test Func" type="TestFunction" />
     </bitfield>
 
+    <enum name="AGDConsistencyType" storage="byte">
+        <option value="0" name="AGD_MUTABLE" />
+        <option value="1" name="AGD_STATIC" />
+        <option value="2" name="AGD_VOLATILE" />
+    </enum>
+
+    <bitfield name="NiAGDDataStreamFlags" storage="byte">
+        Flags for NiAGDDataStream
+        <member width="1" pos="0" mask="0x0001" name="Keep" type="bool" />
+        <member width="3" pos="1" mask="0x0006" name="Consistency Type" type="AGDConsistencyType" default="AGD_MUTABLE" />
+    </bitfield>
+
     <!--Compounds
         These are like C structures and are used as sub-parts of more complex
         classes when there are multiple pieces of data repeated in an array.-->
@@ -6276,57 +6288,48 @@
         <add name="Extent" type="Vector3">Extent of the AABB in all directions</add>
     </niobject>
 
-    <compound name="AdditionalDataInfo">
-        <add name="Data Type" type="int" >Type of data in this channel</add>
-        <add name="Num Channel Bytes Per Element" type="int" >Number of bytes per element of this channel</add>
-        <add name="Num Channel Bytes" type="int" >Total number of bytes of this channel (num vertices times num bytes per element)</add>
-        <add name="Num Total Bytes Per Element" type="int" >Number of bytes per element in all channels together. Sum of num channel bytes per element over all block infos.</add>
-        <add name="Block Index" type="int" >Unsure. The block in which this channel is stored? Usually there is only one block, and so this is zero.</add>
-        <add name="Channel Offset" type="int" >Offset (in bytes) of this channel. Sum of all num channel bytes per element of all preceeding block infos.</add>
-        <add name="Unknown Byte 1" type="byte" default="2" />
+    <compound name="NiAGDDataStream">
+        <add name="Type" type="uint">Type of data in this channel</add>
+        <add name="Unit Size" type="uint">Number of bytes per element of this channel</add>
+        <add name="Total Size" type="uint">Total number of bytes of this channel (num vertices times num bytes per element)</add>
+        <add name="Stride" type="uint">Number of bytes per element in all channels together. Sum of num channel bytes per element over all block infos.</add>
+        <add name="Block Index" type="uint">Unsure. The block in which this channel is stored? Usually there is only one block, and so this is zero.</add>
+        <add name="Block Offset" type="uint">Offset (in bytes) of this channel. Sum of all num channel bytes per element of all preceeding block infos.</add>
+        <add name="Flags" type="NiAGDDataStreamFlags" default="2" />
     </compound>
 
-    <compound name="AdditionalDataBlock">
-        <!-- todo: check if this is essentially the same as BSPackedAdditionalData, i.e. if this is identical to BSPackedAdditionalData minus its last two fields -->
-        <add name="Has Data" type="bool">Has data</add>
-        <add name="Block Size" type="uint" cond="Has Data">Size of Block</add>
-        <add name="Num Blocks" type="uint" cond="Has Data" />
-        <add name="Block Offsets" type="int" arr1="Num Blocks" cond="Has Data" />
-
-        <add name="Num Data" type="uint" cond="Has Data" />
-        <add name="Data Sizes" type="int" arr1="Num Data" cond="Has Data" />
-        <add name="Data" type="byte" arr1="Num Data" arr2="Block Size" cond="Has Data" />
+    <compound name="NiAGDDataBlock">
+        <add name="Block Size" type="uint" />
+        <add name="Num Blocks" type="uint" />
+        <add name="Block Offsets" type="uint" arr1="Num Blocks" />
+        <add name="Num Data" type="uint" />
+        <add name="Data Sizes" type="uint" arr1="Num Data" />
+        <add name="Data" type="byte" arr1="Num Data" arr2="Block Size" />
+        <!-- NiBSPackedAGDDataBlock -->
+        <add name="Shader Index" type="uint" cond="#ARG# == 1" />
+        <add name="Total Size" type="uint" cond="#ARG# == 1" />
     </compound>
 
-    <compound name="BSPackedAdditionalDataBlock" versions="#BETHESDA#">
-        <!-- see Fallout NV (nvdlc01vaultposter01.nif) -->
-        <add name="Has Data" type="bool">Has data</add>
-        <add name="Num Total Bytes" type="uint" cond="Has Data">Total number of bytes (over all channels and all elements, equals num total bytes per element times num vertices).</add>
-        <add name="Num Blocks" type="uint" cond="Has Data">Number of blocks? Usually equal to one.</add>
-        <add name="Block Offsets" type="int" arr1="Num Blocks" cond="Has Data">Block offsets in the data? Usually equal to zero.</add>
-
-        <add name="Num Atoms" type="uint" cond="Has Data">Number of atoms?</add>
-        <add name="Atom Sizes" type="int" arr1="Num Atoms" cond="Has Data">The sum of all of these equal num total bytes per element, so this probably describes how each data element breaks down into smaller chunks (i.e. atoms).</add>
-        <add name="Data" type="byte" arr1="Num Total Bytes" cond="Has Data" />
-        <add name="Unknown Int 1" type="int" />
-        <add name="Num Total Bytes Per Element" type="int">Unsure, but this seems to correspond again to the number of total bytes per element.</add>
+    <compound name="NiAGDDataBlocks">
+        <add name="Has Data" type="bool" />
+        <add name="Data Block" type="NiAGDDataBlock" cond="Has Data" arg="#ARG#" />
     </compound>
 
     <niobject name="NiAdditionalGeometryData" inherit="AbstractAdditionalGeometryData">
-        <add name="Num Vertices" type="ushort">Number of vertices</add>
-        <add name="Num Block Infos" type="uint">Information about additional data blocks</add>
-        <add name="Block Infos" type="AdditionalDataInfo" arr1="Num Block Infos">Number of additional data blocks</add>
-        <add name="Num Blocks" type="uint">Number of additional data blocks</add>
-        <add name="Blocks" type="AdditionalDataBlock" arr1="Num Blocks">Number of additional data blocks</add>
+        <add name="Num Vertices" type="ushort" />
+        <add name="Num Block Infos" type="uint" />
+        <add name="Block Infos" type="NiAGDDataStream" arr1="Num Block Infos" />
+        <add name="Num Blocks" type="uint" />
+        <add name="Blocks" type="NiAGDDataBlocks" arg="0" arr1="Num Blocks" />
     </niobject>
 
     <niobject name="BSPackedAdditionalGeometryData" inherit="AbstractAdditionalGeometryData" versions="#BETHESDA#">
         No longer appears to occur in any vanilla files. Older versions of FNV had the block in nvdlc01vaultposter01.nif.
         <add name="Num Vertices" type="ushort" />
-        <add name="Num Block Infos" type="uint">Information about additional data blocks</add>
-        <add name="Block Infos" type="AdditionalDataInfo" arr1="Num Block Infos">Number of additional data blocks</add>
-        <add name="Num Blocks" type="uint">Number of additional data blocks. Usually there is exactly one block.</add>
-        <add name="Blocks" type="BSPackedAdditionalDataBlock" arr1="Num Blocks">Number of additional data blocks</add>
+        <add name="Num Block Infos" type="uint" />
+        <add name="Block Infos" type="NiAGDDataStream" arr1="Num Block Infos" />
+        <add name="Num Blocks" type="uint">Usually there is exactly one block.</add>
+        <add name="Blocks" type="NiAGDDataBlocks" arg="1" arr1="Num Blocks" />
     </niobject>
 
     <niobject name="BSWArray" inherit="NiExtraData" versions="#FO3_AND_LATER#">

From 8f3b2d051c897709989274d0a16bc053dec8c1e7 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sat, 16 Jun 2018 20:36:22 -0400
Subject: [PATCH 48/86] Move BSGeometry mimicry for NiParticles

---
 nif.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/nif.xml b/nif.xml
index 0493e6a..a22fb5e 100644
--- a/nif.xml
+++ b/nif.xml
@@ -4077,7 +4077,13 @@
 
     <niobject name="NiParticles" inherit="NiGeometry">
         Generic particle system node.
+        Contains members to mimic inheritance shifts for Bethesda 20.2, which switched to using BSGeometry.
         <add name="Vertex Desc" type="BSVertexDesc" vercond="#BS_GTE_SSE#" />
+        <add name="Far Begin" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Far End" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Near Begin" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Near End" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Data" type="Ref" template="NiPSysData" vercond="#BS_GTE_SSE#" />
     </niobject>
 
     <niobject name="NiAutoNormalParticles" inherit="NiParticles" until="V10_0_1_0">
@@ -4095,13 +4101,6 @@
 
     <niobject name="NiParticleSystem" inherit="NiParticles">
         A particle system.
-        <!-- Bethesda -->
-        <add name="Far Begin" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Far End" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Near Begin" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Near End" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Data" type="Ref" template="NiPSysData" vercond="#BS_GTE_SSE#" />
-        <!-- / Bethesda -->
         <add name="World Space" type="bool" default="1" ver1="10.1.0.0">If true, Particles are birthed into world space.  If false, Particles are birthed into object space.</add>
         <add name="Num Modifiers" type="uint" ver1="10.1.0.0">The number of modifier references.</add>
         <add name="Modifiers" type="Ref" template="NiPSysModifier" arr1="Num Modifiers" ver1="10.1.0.0">The list of particle modifiers.</add>

From 34ae18ebff3c7ffec68c37ec2f37e7b1498be163 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sat, 16 Jun 2018 20:41:37 -0400
Subject: [PATCH 49/86] Add NiPhysXClothDesc

---
 nif.xml | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/nif.xml b/nif.xml
index a22fb5e..24c0aec 100644
--- a/nif.xml
+++ b/nif.xml
@@ -5190,7 +5190,7 @@
         <add name="Num Joints" type="uint" />
         <add name="Joints" type="Ref" template="NiPhysXJointDesc" arr1="Num Joints" />
         <add name="Num Clothes" type="uint" ver1="20.3.0.5" />
-        <add name="Clothes" type="Ref" template="NiObject" arr1="Num Clothes" ver1="20.3.0.5" /> <!-- NiPhysXClothDesc -->
+        <add name="Clothes" type="Ref" template="NiPhysXClothDesc" arr1="Num Clothes" ver1="20.3.0.5" />
         <add name="Num Materials" type="uint" />
         <add name="Materials" type="PhysXMaterialRef" arr1="Num Materials" />
         <add name="Num States" type="uint" />
@@ -5448,6 +5448,71 @@
         <add name="Material Descs" type="NxMaterialDesc" arr1="Num States" />
     </niobject>
 
+    <compound name="PhysXClothState" since="V20_2_0_8">
+        <add name="Pose" type="Matrix34" />
+        <add name="Num Vertex Positions" type="ushort" />
+        <add name="Vertex Positions" type="Vector3" arr1="Num Vertex Positions" />
+        <add name="Num Tear Indices" type="ushort" />
+        <add name="Tear Indices" type="ushort" arr1="Num Tear Indices" />
+        <add name="Tear Split Planes" type="Vector3" arr1="Num Tear Indices" />
+    </compound>
+
+    <compound name="PhysXClothAttachmentPosition" since="V20_2_0_8">
+        <add name="Vertex ID" type="uint" />
+        <add name="Position" type="Vector3" />
+        <add name="Flags" type="uint" />
+    </compound>
+
+    <compound name="PhysXClothAttachment" since="V20_2_0_8">
+        <add name="Shape" type="Ref" template="NiPhysXShapeDesc" />
+        <add name="Num Vertices" type="uint" />
+        <add name="Flags" type="uint" cond="Num Vertices == 0" />
+        <add name="Positions" type="PhysXClothAttachmentPosition" cond="Num Vertices #GT# 0" arr1="Num Vertices" />
+    </compound>
+
+    <niobject name="NiPhysXClothDesc" inherit="NiObject" since="V20_2_0_8">
+        For serializing NxClothDesc objects.
+        <add name="Name" type="string" />
+        <add name="Mesh" type="Ref" template="NiPhysXMeshDesc" />
+        <add name="Pose" type="Matrix34" ver2="20.3.0.9" />
+        <add name="Thickness" type="float" />
+        <add name="Self Collision Thickness" type="float" ver1="30.1.0.3" />
+        <add name="Density" type="float" />
+        <add name="Bending Stiffness" type="float" />
+        <add name="Stretching Stiffness" type="float" />
+        <add name="Damping Coefficient" type="float" />
+        <add name="Hard Stretch Limitation Factor" type="float" ver1="30.1.0.3" />
+        <add name="Friction" type="float" />
+        <add name="Pressure" type="float" />
+        <add name="Tear Factor" type="float" />
+        <add name="Collision Response Coeff" type="float" />
+        <add name="Attach Response Coeff" type="float" />
+        <add name="Attach Tear Factor" type="float" />
+        <add name="To Fluid Response Coeff" type="float" ver1="20.4.0.0" />
+        <add name="From Fluid Response Coeff" type="float" ver1="20.4.0.0" />
+        <add name="Min Adhere Velocity" type="float" ver1="20.4.0.0" />
+        <add name="Relative Grid Spacing" type="float" ver1="20.4.0.0" />
+        <add name="Solver Iterations" type="uint" />
+        <add name="Hier Solver Iterations" type="uint" ver1="30.1.0.3" />
+        <add name="External Acceleration" type="Vector3" />
+        <add name="Wind Acceleration" type="float" ver1="20.4.0.0" />
+        <add name="Wake Up Counter" type="float" />
+        <add name="Sleep Linear Velocity" type="float" />
+        <add name="Collision Group" type="ushort" />
+        <add name="Collision Bits" type="uint" arr1="4" />
+        <add name="Force Field Material" type="ushort" ver1="20.4.0.0" />
+        <add name="Flags" type="uint" />
+        <add name="Vertex Map Size" type="ushort" ver1="30.2.0.3" />
+        <add name="Vertex Map" type="ushort" arr1="Vertex Map Size" ver1="30.2.0.3" />
+        <add name="Num States" type="uint" ver1="20.4.0.0" />
+        <add name="States" type="PhysXClothState" arr1="Num States" ver1="20.4.0.0" />
+        <add name="Num Attachments" type="uint" />
+        <add name="Attachments" type="PhysXClothAttachment" arr1="Num Attachments" />
+        <add name="Parent Actor" type="Ref" template="NiPhysXActorDesc" />
+        <add name="Dest" type="Ref" template="NiPhysXDest" ver2="20.4.0.9" />
+        <add name="Target Mesh" type="Ref" template="NiMesh" ver2="20.5.0.0" />
+    </niobject>
+
     <niobject name="NiPhysXDest" inherit="NiObject" abstract="1" since="V20_2_0_8">
         A destination is a link between a PhysX actor and a Gamebryo object being driven by the physics.
         <add name="Active" type="bool" />

From 7fb123395cf42fda755ee1f8cf0d30b8dd714e94 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sat, 16 Jun 2018 20:51:24 -0400
Subject: [PATCH 50/86] Rename `binary`/`abstract` booleans from 1 to true

For #76

For reduced ambiguity.  Adapting for this in Python is as easy as

```py
# XML Booleans
XML_TRUE = ["true", "1"]
XML_FALSE = ["false", "0"]

# Example
self.is_abstract = get('abstract') in XML_TRUE
```

Note "True" and "False" are not valid booleans in XML.  Only lowercase.
---
 nif.xml | 166 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 83 insertions(+), 83 deletions(-)

diff --git a/nif.xml b/nif.xml
index 24c0aec..d607428 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2423,7 +2423,7 @@
          are treated as object types by the NIF format and can inherit
          from other classes.-->
 
-    <niobject name="NiObject" abstract="1">
+    <niobject name="NiObject" abstract="true">
         Abstract object type.
     </niobject>
 
@@ -2469,13 +2469,13 @@
     </niobject>
 
 
-    <niobject name="NiParticleModifier" abstract="1" inherit="NiObject" until="V10_0_1_0">
+    <niobject name="NiParticleModifier" abstract="true" inherit="NiObject" until="V10_0_1_0">
         LEGACY (pre-10.1). Abstract base class for particle system modifiers.
         <add name="Next Modifier" type="Ref" template="NiParticleModifier">Next particle modifier.</add>
         <add name="Controller" type="Ptr" template="NiParticleSystemController" ver1="3.3.0.13">Points to the particle system controller parent.</add>
     </niobject>
 
-    <niobject name="NiPSysCollider" abstract="1" inherit="NiObject">
+    <niobject name="NiPSysCollider" abstract="true" inherit="NiObject">
         Particle system collider.
         <add name="Bounce" type="float" default="1.0">Amount of bounce for the collider.</add>
         <add name="Spawn on Collide" type="bool">Spawn particles on impact?</add>
@@ -2499,15 +2499,15 @@
         <add name="Capacity and Flags" type="uint" default="0x80000000" />
     </compound>
 
-    <niobject name="bhkRefObject" abstract="1" inherit="NiObject" versions="#BETHESDA#">
+    <niobject name="bhkRefObject" abstract="true" inherit="NiObject" versions="#BETHESDA#">
         The base type of most Bethesda-specific Havok-related NIF objects.
     </niobject>
 
-    <niobject name="bhkSerializable" abstract="1" inherit="bhkRefObject" versions="#BETHESDA#">
+    <niobject name="bhkSerializable" abstract="true" inherit="bhkRefObject" versions="#BETHESDA#">
         Havok objects that can be saved and loaded from disk?
     </niobject>
 
-    <niobject name="bhkWorldObject" abstract="1" inherit="bhkSerializable" versions="#BETHESDA#">
+    <niobject name="bhkWorldObject" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
         Havok objects that have a position in the world?
         <add name="Shape" type="Ref" template="bhkShape"> Link to the body for this collision object.</add>
         <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
@@ -2518,11 +2518,11 @@
         <add name="Cinfo Property" type="hkWorldObjCinfoProperty" />
     </niobject>
 
-    <niobject name="bhkPhantom" abstract="1" inherit="bhkWorldObject" versions="#BETHESDA#">
+    <niobject name="bhkPhantom" abstract="true" inherit="bhkWorldObject" versions="#BETHESDA#">
         Havok object that do not react with other objects when they collide (causing deflection, etc.) but still trigger collision notifications to the game.  Possible uses are traps, portals, AI fields, etc.
     </niobject>
 
-    <niobject name="bhkShapePhantom" abstract="1" inherit="bhkPhantom" versions="#BETHESDA#">
+    <niobject name="bhkShapePhantom" abstract="true" inherit="bhkPhantom" versions="#BETHESDA#">
         A Havok phantom that uses a Havok shape object for its collision volume instead of just a bounding box.
     </niobject>
 
@@ -2532,7 +2532,7 @@
         <add name="Transform" type="Matrix44" />
     </niobject>
 
-    <niobject name="bhkEntity" abstract="1" inherit="bhkWorldObject" versions="#BETHESDA#">
+    <niobject name="bhkEntity" abstract="true" inherit="bhkWorldObject" versions="#BETHESDA#">
         A havok node, describes physical properties.
     </niobject>
 
@@ -2598,7 +2598,7 @@
         The "T" suffix marks this body as active for translation and rotation.
     </niobject>
 
-    <niobject name="bhkConstraint" abstract="1" inherit="bhkSerializable" versions="#BETHESDA#">
+    <niobject name="bhkConstraint" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
         Describes a physical constraint.
         <add name="Num Entities" type="uint">Number of bodies affected by this constraint.</add>
         <add name="Entities" type="Ptr" template="bhkEntity" arr1="Num Entities">The entities affected by this constraint.</add>
@@ -2662,7 +2662,7 @@
         <add name="Priority" type="uint" />
     </niobject>
 
-    <niobject name="bhkShape" abstract="1" inherit="bhkSerializable" versions="#BETHESDA#">
+    <niobject name="bhkShape" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
         The base class for narrowphase collision detection objects.
         All narrowphase collision detection is performed between pairs of bhkShape objects by creating appropriate collision agents.
     </niobject>
@@ -2676,17 +2676,17 @@
         <add name="Transform" type="Matrix44">A transform matrix.</add>
     </niobject>
 
-    <niobject name="bhkSphereRepShape" abstract="1" inherit="bhkShape" versions="#BETHESDA#">
+    <niobject name="bhkSphereRepShape" abstract="true" inherit="bhkShape" versions="#BETHESDA#">
         An interface that produces a set of spheres that represent a simplified version of the shape.
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
     </niobject>
 
-    <niobject name="bhkConvexShape" abstract="1" inherit="bhkSphereRepShape" versions="#BETHESDA#">
+    <niobject name="bhkConvexShape" abstract="true" inherit="bhkSphereRepShape" versions="#BETHESDA#">
         An interface that allows testing convex sets using the GJK algorithm. Also holds a radius value for creating a shell.
         <add name="Radius" type="float" default="0.05">The radius is used to create a thin shell that is used as the shape surface.</add>
     </niobject>
 
-    <niobject name="bhkHeightFieldShape" inherit="bhkShape" abstract="1" versions="#BETHESDA#">
+    <niobject name="bhkHeightFieldShape" inherit="bhkShape" abstract="true" versions="#BETHESDA#">
         An interface for a shape which can collide with an array of spheres.
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
     </niobject>
@@ -2765,7 +2765,7 @@
         <add name="Spheres" type="NiBound" arr1="Num Spheres">This array holds the spheres which make up the multi sphere shape.</add>
     </niobject>
 
-    <niobject name="bhkBvTreeShape" abstract="1" inherit="bhkShape" versions="#BETHESDA#">
+    <niobject name="bhkBvTreeShape" abstract="true" inherit="bhkShape" versions="#BETHESDA#">
         Adds bounding volume tree information to an shape collection.
         A bounding volume tree is useful for testing collision between a moving object and large static geometry.
     </niobject>
@@ -2779,11 +2779,11 @@
         <add name="Origin" type="Vector3" ver1="10.1.0.0">Origin of the object in mopp coordinates. This is the minimum of all vertices in the packed shape along each axis, minus 0.1.</add>
         <add name="Scale" type="float" ver1="10.1.0.0">The scaling factor to quantize the MOPP: the quantization factor is equal to 256*256 divided by this number. In Oblivion files, scale is taken equal to 256*256*254 / (size + 0.2) where size is the largest dimension of the bounding box of the packed shape.</add>
         <add name="Build Type" type="MoppDataBuildType" vercond="#BS_GT_FO3#">Tells if MOPP Data was organized into smaller chunks (PS3) or not (PC)</add>
-        <add name="MOPP Data" type="byte" binary="1" arr1="MOPP Data Size">The tree of bounding volume data.</add>
+        <add name="MOPP Data" type="byte" binary="true" arr1="MOPP Data Size">The tree of bounding volume data.</add>
     </niobject>
 
 
-    <niobject name="bhkShapeCollection" abstract="1" inherit="bhkShape" versions="#BETHESDA#">
+    <niobject name="bhkShapeCollection" abstract="true" inherit="bhkShape" versions="#BETHESDA#">
         An interface to a collection of bhkShapes.
     </niobject>
 
@@ -2854,11 +2854,11 @@
         <add name="Num Bytes" type="uint" ver1="4.0.0.0" ver2="4.2.2.0">Ignore binary data after 4.x as the child block will cover it.</add>
     </niobject>
 
-    <niobject name="NiInterpolator" abstract="1" inherit="NiObject">
+    <niobject name="NiInterpolator" abstract="true" inherit="NiObject">
         Abstract base class for all interpolators of bool, float, NiQuaternion, NiPoint3, NiColorA, and NiQuatTransform data.
     </niobject>
 
-    <niobject name="NiKeyBasedInterpolator" abstract="1" inherit="NiInterpolator">
+    <niobject name="NiKeyBasedInterpolator" abstract="true" inherit="NiInterpolator">
         Abstract base class for interpolators that use NiAnimationKeys (Key, KeyGrp) for interpolation.
     </niobject>
 
@@ -2932,7 +2932,7 @@
         <add name="Ease Spinner" type="float" />
     </compound>
 
-    <niobject name="NiBlendInterpolator" abstract="1" inherit="NiInterpolator">
+    <niobject name="NiBlendInterpolator" abstract="true" inherit="NiInterpolator">
         Abstract base class for all NiInterpolators that blend the results of sub-interpolators together to compute a final weighted value.
         <add name="Flags" type="InterpBlendFlags" ver1="10.1.0.112" />
         <add name="Array Size" type="ushort" ver2="10.1.0.109" />
@@ -2966,7 +2966,7 @@
         <add name="Next High Priority" type="byte" ver1="10.1.0.110" ver2="10.1.0.111" />
     </niobject>
 
-    <niobject name="NiBSplineInterpolator" abstract="1" inherit="NiInterpolator">
+    <niobject name="NiBSplineInterpolator" abstract="true" inherit="NiInterpolator">
         Abstract base class for interpolators storing data via a B-spline.
         <add name="Start Time" type="float" default="#FLT_MAX#">Animation start time.</add>
         <add name="Stop Time" type="float" default="#FLT_MIN#">Animation stop time.</add>
@@ -2983,7 +2983,7 @@
         <add name="Unknown Byte 1" type="byte" />
     </compound>
 
-    <niobject name="NiObjectNET" abstract="1" inherit="NiObject">
+    <niobject name="NiObjectNET" abstract="true" inherit="NiObject">
         Abstract base class for NiObjects that support names, extra data, and time controllers.
         <add name="Skyrim Shader Type" type="BSLightingShaderPropertyShaderType" vercond="#BS_GTE_SKY#" onlyT="BSLightingShaderProperty">Configures the main shader path</add>
         <add name="Name" type="string">Name of this controllable object, used to refer to the object in .kf files.</add>
@@ -3023,7 +3023,7 @@
         <option value="11" name="DISMEMBERED_LIMB" />
     </bitflags>
 
-    <niobject name="bhkNiCollisionObject" abstract="1" inherit="NiCollisionObject">
+    <niobject name="bhkNiCollisionObject" abstract="true" inherit="NiCollisionObject">
         Havok related collision object?
         <add name="Flags" type="bhkCOFlags" default="1">
             Set to 1 for most objects, and to 41 for animated objects (ANIM_STATIC). Bits: 0=Active 2=Notify 3=Set Local 6=Reset.
@@ -3051,7 +3051,7 @@
         Unknown.
     </niobject>
 
-    <niobject name="NiAVObject" abstract="1" inherit="NiObjectNET">
+    <niobject name="NiAVObject" abstract="true" inherit="NiObjectNET">
         Abstract audio-visual base class from which all of Gamebryo's scene graph objects inherit.
         <add name="Flags" type="uint" default="524302" vercond="#BSVER# #GT# 26">Basic flags for AV objects. For Bethesda streams above 26 only.</add>
         <add name="Flags" type="ushort" ver1="3.0" vercond="#BSVER# #LTE# 26">Basic flags for AV objects; commonly 0x000C or 0x000A.</add>
@@ -3068,7 +3068,7 @@
         <add name="Collision Object" type="Ref" template="NiCollisionObject" ver1="10.0.1.0" />
     </niobject>
 
-    <niobject name="NiDynamicEffect" abstract="1" inherit="NiAVObject">
+    <niobject name="NiDynamicEffect" abstract="true" inherit="NiAVObject">
         Abstract base class for dynamic effects such as NiLights or projected texture effects.
         <add name="Switch State" type="bool" default="1" ver1="10.1.0.106" vercond="#NI_BS_LT_FO4#">If true, then the dynamic effect is applied to affected nodes during rendering.</add>
         <add name="Num Affected Nodes" type="uint" ver2="4.0.0.2" />
@@ -3078,7 +3078,7 @@
         <add name="Affected Nodes" type="Ptr" template="NiNode" arr1="Num Affected Nodes" ver1="10.1.0.0" vercond="#NI_BS_LT_FO4#">If a node appears in this list, then its entire subtree will be affected by the effect.</add>
     </niobject>
 
-    <niobject name="NiLight" abstract="1" inherit="NiDynamicEffect">
+    <niobject name="NiLight" abstract="true" inherit="NiDynamicEffect">
         Abstract base class that represents light sources in a scene graph.
         For Bethesda Stream 130 (FO4), NiLight now directly inherits from NiAVObject.
         <add name="Dimmer" type="float" default="1.0">Scales the overall brightness of all light components.</add>
@@ -3087,7 +3087,7 @@
         <add name="Specular Color" type="Color3" default="#VEC3_ZERO#" />
     </niobject>
 
-    <niobject name="NiProperty" abstract="1" inherit="NiObjectNET">
+    <niobject name="NiProperty" abstract="true" inherit="NiObjectNET">
         Abstract base class representing all rendering properties. Subclasses are attached to NiAVObjects to control their rendering.
     </niobject>
 
@@ -3096,7 +3096,7 @@
         <add name="Unknown" type="byte" arr1="6" />
     </niobject>
 
-    <niobject name="NiPSysModifier" abstract="1" inherit="NiObject">
+    <niobject name="NiPSysModifier" abstract="true" inherit="NiObject">
         Abstract base class for all particle system modifiers.
         <add name="Name" type="string">Used to locate the modifier.</add>
         <add name="Order" type="uint">Modifier ID in the particle modifier chain (always a multiple of 1000)?</add>
@@ -3104,7 +3104,7 @@
         <add name="Active" type="bool" default="1">Whether or not the modifier is active.</add>
     </niobject>
 
-    <niobject name="NiPSysEmitter" abstract="1" inherit="NiPSysModifier">
+    <niobject name="NiPSysEmitter" abstract="true" inherit="NiPSysModifier">
         Abstract base class for all particle system emitters.
         <add name="Speed" type="float">Speed / Inertia of particle movement.</add>
         <add name="Speed Variation" type="float">Adds an amount of randomness to Speed.</add>
@@ -3119,12 +3119,12 @@
         <add name="Life Span Variation" type="float">Adds randomness to Life Span.</add>
     </niobject>
 
-    <niobject name="NiPSysVolumeEmitter" abstract="1" inherit="NiPSysEmitter">
+    <niobject name="NiPSysVolumeEmitter" abstract="true" inherit="NiPSysEmitter">
         Abstract base class for particle emitters that emit particles from a volume.
         <add name="Emitter Object" type="Ptr" template="NiNode" ver1="10.1.0.0">Node parent of this modifier?</add>
     </niobject>
 
-    <niobject name="NiTimeController" abstract="1" inherit="NiObject">
+    <niobject name="NiTimeController" abstract="true" inherit="NiObject">
         Abstract base class that provides the base timing and update functionality for all the Gamebryo animation controllers.
         <add name="Next Controller" type="Ref" template="NiTimeController">Index of the next controller.</add>
         <add name="Flags" type="TimeControllerFlags" default="76" />
@@ -3137,7 +3137,7 @@
     </niobject>
 
 
-    <niobject name="NiInterpController" abstract="1" inherit="NiTimeController">
+    <niobject name="NiInterpController" abstract="true" inherit="NiTimeController">
         Abstract base class for all NiTimeController objects using NiInterpolator objects to animate their target objects.
         <add name="Manager Controlled" type="bool" ver1="10.1.0.104" ver2="10.1.0.108" />
     </niobject>
@@ -3170,7 +3170,7 @@
         <add name="Data" type="Ref" template="NiMorphData">This controller's data.</add>
     </niobject>
 
-    <niobject name="NiSingleInterpController" abstract="1" inherit="NiInterpController">
+    <niobject name="NiSingleInterpController" abstract="true" inherit="NiInterpController">
         Uses a single NiInterpolator to animate its target value.
         <add name="Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.104" />
     </niobject>
@@ -3185,7 +3185,7 @@
         NiTransformController replaces NiKeyframeController.
     </niobject>
 
-    <niobject name="NiPSysModifierCtlr" abstract="1" inherit="NiSingleInterpController">
+    <niobject name="NiPSysModifierCtlr" abstract="true" inherit="NiSingleInterpController">
         A particle system modifier controller.
         NiInterpController::GetCtlrID() string format:
             '%s'
@@ -3201,7 +3201,7 @@
         <add name="Visibility Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.104" />
     </niobject>
 
-    <niobject name="NiPSysModifierBoolCtlr" abstract="1" inherit="NiPSysModifierCtlr">
+    <niobject name="NiPSysModifierBoolCtlr" abstract="true" inherit="NiPSysModifierCtlr">
         A particle system modifier controller that animates a boolean value for particles.
     </niobject>
 
@@ -3210,7 +3210,7 @@
         <add name="Data" type="Ref" template="NiVisData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiPSysModifierFloatCtlr" abstract="1" inherit="NiPSysModifierCtlr">
+    <niobject name="NiPSysModifierFloatCtlr" abstract="true" inherit="NiPSysModifierCtlr">
         A particle system modifier controller that animates a floating point value for particles.
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
@@ -3240,7 +3240,7 @@
     </niobject>
 
 
-    <niobject name="NiFloatInterpController" abstract="1" inherit="NiSingleInterpController">
+    <niobject name="NiFloatInterpController" abstract="true" inherit="NiSingleInterpController">
         Abstract base class for all NiInterpControllers that use an NiInterpolator to animate their target float value.
     </niobject>
 
@@ -3278,7 +3278,7 @@
         Unknown controller.
     </niobject>
 
-    <niobject name="NiBoolInterpController" abstract="1" inherit="NiSingleInterpController">
+    <niobject name="NiBoolInterpController" abstract="true" inherit="NiSingleInterpController">
         Abstract base class for all NiInterpControllers that use a NiInterpolator to animate their target boolean value.
     </niobject>
 
@@ -3287,7 +3287,7 @@
         <add name="Data" type="Ref" template="NiVisData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiPoint3InterpController" abstract="1" inherit="NiSingleInterpController">
+    <niobject name="NiPoint3InterpController" abstract="true" inherit="NiSingleInterpController">
         Abstract base class for all NiInterpControllers that use an NiInterpolator to animate their target NiPoint3 value.
     </niobject>
 
@@ -3309,7 +3309,7 @@
     </niobject>
 
 
-    <niobject name="NiExtraDataController" abstract="1" inherit="NiSingleInterpController">
+    <niobject name="NiExtraDataController" abstract="true" inherit="NiSingleInterpController">
         Abstract base class for all extra data controllers.
         NiInterpController::GetCtlrID() string format:
             '%s'
@@ -3377,7 +3377,7 @@
         <add name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</add>
     </compound>
 
-    <niobject name="NiGeometry" abstract="1" inherit="NiAVObject">
+    <niobject name="NiGeometry" abstract="true" inherit="NiAVObject">
         Describes a visible scene element with vertices like a mesh, a particle system, lines, etc.
             Bethesda 20.2.0.7 NIFs: NiGeometry was changed to BSGeometry. 
             Most new blocks (e.g. BSTriShape) do not refer to NiGeometry except NiParticleSystem was changed to use BSGeometry.
@@ -3395,7 +3395,7 @@
         <add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
     </niobject>
 
-    <niobject name="NiTriBasedGeom" abstract="1" inherit="NiGeometry">
+    <niobject name="NiTriBasedGeom" abstract="true" inherit="NiGeometry">
         Describes a mesh, built from triangles.
     </niobject>
 
@@ -3437,7 +3437,7 @@
         <option value="15" name="Unk32768" />
     </bitflags>
 
-    <niobject name="NiGeometryData" abstract="1" inherit="NiObject">
+    <niobject name="NiGeometryData" abstract="true" inherit="NiObject">
         Mesh data: vertices, vertex normals, etc.
             Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly. 
             "Num Vertices" is renamed to "BS Max Vertices" for Bethesda 20.2 because Vertices, Normals, Tangents, Colors, and UV arrays
@@ -3480,10 +3480,10 @@
         <add name="Additional Data" type="Ref" template="AbstractAdditionalGeometryData" ver1="20.0.0.4" />
     </niobject>
 
-    <niobject name="AbstractAdditionalGeometryData" abstract="1" inherit="NiObject">
+    <niobject name="AbstractAdditionalGeometryData" abstract="true" inherit="NiObject">
     </niobject>
 
-    <niobject name="NiTriBasedGeomData" abstract="1" inherit="NiGeometryData">
+    <niobject name="NiTriBasedGeomData" abstract="true" inherit="NiGeometryData">
         Describes a mesh, built from triangles.
         <add name="Num Triangles" type="ushort">Number of triangles.</add>
     </niobject>
@@ -3667,7 +3667,7 @@
         <add name="Num Control Points" type="uint">The number of control points of the B-spline (number of frames of animation plus degree of B-spline minus one).</add>
     </niobject>
 
-    <niobject name="NiBSplineFloatInterpolator" abstract="1" inherit="NiBSplineInterpolator">
+    <niobject name="NiBSplineFloatInterpolator" abstract="true" inherit="NiBSplineInterpolator">
         Uses B-Splines to animate a float value over time.
         <add name="Value" type="float" default="#INV_FLT#">Base value when curve not defined.</add>
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
@@ -3679,7 +3679,7 @@
         <add name="Float Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
-    <niobject name="NiBSplinePoint3Interpolator" abstract="1" inherit="NiBSplineInterpolator">
+    <niobject name="NiBSplinePoint3Interpolator" abstract="true" inherit="NiBSplineInterpolator">
         Uses B-Splines to animate an NiPoint3 value over time.
         <add name="Value" type="Vector3" default="#INV_VEC3#">Base value when curve not defined.</add>
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
@@ -3793,7 +3793,7 @@
         <add name="Anim Note Arrays" type="Ref" template="BSAnimNotes" arr1="Num Anim Note Arrays" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
     </niobject>
 
-    <niobject name="NiAVObjectPalette" abstract="1" inherit="NiObject">
+    <niobject name="NiAVObjectPalette" abstract="true" inherit="NiObject">
         Abstract base class for indexing NiAVObject by name.
     </niobject>
 
@@ -4185,7 +4185,7 @@
         <add name="Is Signed" type="bool" />
     </compound>
 
-    <niobject name="NiPixelFormat" abstract="1" inherit="NiObject">
+    <niobject name="NiPixelFormat" abstract="true" inherit="NiObject">
         NiPixelFormat is not the parent to NiPixelData/NiPersistentSrcTextureRendererData,
         but actually a member class loaded at the top of each. The two classes are not related.
         However, faking this inheritance is useful for several things.
@@ -4222,7 +4222,7 @@
         <add name="Num Faces" type="uint" />
         <add name="Platform" type="PlatformID" ver2="30.1.0.0" />
         <add name="Renderer" type="RendererID" ver1="30.1.0.1" />
-        <add name="Pixel Data" type="byte" binary="1" arr1="Num Pixels * Num Faces" />
+        <add name="Pixel Data" type="byte" binary="true" arr1="Num Pixels * Num Faces" />
     </niobject>
 
     <niobject name="NiPixelData" inherit="NiPixelFormat">
@@ -4234,8 +4234,8 @@
         <add name="Num Pixels" type="uint" />
         <!-- Technically since 10.3.0.6, fudging for WorldShift custom version as no games have official 10.3 NIFs anyway. -->
         <add name="Num Faces" type="uint" ver1="10.4.0.2" default="1" />
-        <add name="Pixel Data" type="byte" binary="1" arr1="Num Pixels" ver2="10.4.0.1" />
-        <add name="Pixel Data" type="byte" binary="1" arr1="Num Pixels * Num Faces" ver1="10.4.0.2" />
+        <add name="Pixel Data" type="byte" binary="true" arr1="Num Pixels" ver2="10.4.0.1" />
+        <add name="Pixel Data" type="byte" binary="true" arr1="Num Pixels * Num Faces" ver1="10.4.0.2" />
     </niobject>
 
     <niobject name="NiPlanarCollider" inherit="NiParticleModifier" until="V10_0_1_0">
@@ -4465,7 +4465,7 @@
         Particle system controller, tells the system to update its simulation.
     </niobject>
 
-    <niobject name="NiPSysFieldModifier" abstract="1" inherit="NiPSysModifier">
+    <niobject name="NiPSysFieldModifier" abstract="true" inherit="NiPSysModifier">
         Base for all force field particle modifiers.
         <add name="Field Object" type="Ref" template="NiAVObject">The object whose position and orientation are the basis of the field.</add>
         <add name="Magnitude" type="float">Magnitude of the force.</add>
@@ -4591,7 +4591,7 @@
         <add name="Radial Type" type="float">If zero, no attenuation.</add>
     </niobject>
 
-    <niobject name="NiLODData" abstract="1" inherit="NiObject">
+    <niobject name="NiLODData" abstract="true" inherit="NiObject">
         Abstract class used for different types of LOD selections.
     </niobject>
 
@@ -4661,7 +4661,7 @@
 		<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
     </niobject>
 
-    <niobject name="NiTexture" abstract="1" inherit="NiObjectNET">
+    <niobject name="NiTexture" abstract="true" inherit="NiObjectNET">
         A texture.
     </niobject>
 
@@ -5007,7 +5007,7 @@
         <add name="RGBA Image Data" type="ByteColor4" arr1="Width" arr2="Height" cond="Image Type == 2" >Image pixel data.</add>
     </niobject>
     
-    <niobject name="NiAccumulator" abstract="1" inherit="NiObject" />
+    <niobject name="NiAccumulator" abstract="true" inherit="NiObject" />
 
     <niobject name="NiSortAdjustNode" inherit="NiNode">
         Used to turn sorting off for individual subtrees in a scene. Useful if objects must be drawn in a fixed order.
@@ -5303,7 +5303,7 @@
         <add name="Limit Plane R" type="float" ver1="20.4.0.0" />
     </compound>
 
-    <niobject name="NiPhysXJointDesc" inherit="NiObject" abstract="1" since="V20_2_0_8">
+    <niobject name="NiPhysXJointDesc" inherit="NiObject" abstract="true" since="V20_2_0_8">
         A PhysX Joint abstract base class.
         <add name="Joint Type" type="NxJointType" />
         <add name="Joint Name" type="string" />
@@ -5513,13 +5513,13 @@
         <add name="Target Mesh" type="Ref" template="NiMesh" ver2="20.5.0.0" />
     </niobject>
 
-    <niobject name="NiPhysXDest" inherit="NiObject" abstract="1" since="V20_2_0_8">
+    <niobject name="NiPhysXDest" inherit="NiObject" abstract="true" since="V20_2_0_8">
         A destination is a link between a PhysX actor and a Gamebryo object being driven by the physics.
         <add name="Active" type="bool" />
         <add name="Interpolate" type="bool" />
     </niobject>
 
-    <niobject name="NiPhysXRigidBodyDest" inherit="NiPhysXDest" abstract="1" since="V20_2_0_8">
+    <niobject name="NiPhysXRigidBodyDest" inherit="NiPhysXDest" abstract="true" since="V20_2_0_8">
         Base for destinations that set a rigid body state.
     </niobject>
 
@@ -5528,13 +5528,13 @@
         <add name="Target" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPhysXSrc" inherit="NiObject" abstract="1" since="V20_2_0_8">
+    <niobject name="NiPhysXSrc" inherit="NiObject" abstract="true" since="V20_2_0_8">
         A source is a link between a Gamebryo object and a PhysX actor.
         <add name="Active" type="bool" />
         <add name="Interpolate" type="bool" />
     </niobject>
 
-    <niobject name="NiPhysXRigidBodySrc" inherit="NiPhysXSrc" abstract="1" since="V20_2_0_8">
+    <niobject name="NiPhysXRigidBodySrc" inherit="NiPhysXSrc" abstract="true" since="V20_2_0_8">
         Sets state of a rigid body PhysX actor.
         <add name="Source" type="Ptr" template="NiAVObject" />
     </niobject>
@@ -5713,7 +5713,7 @@
         <add name="Environment Map Scale" type="float" default="1.0" vercond="#NI_BS_LTE_FO3#">Scales the intensity of the environment/cube map.</add>
     </niobject>
 
-    <niobject name="BSShaderLightingProperty" abstract="1" inherit="BSShaderProperty" versions="#FO3#">
+    <niobject name="BSShaderLightingProperty" abstract="true" inherit="BSShaderProperty" versions="#FO3#">
         Bethesda-specific property.
         <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" vercond="#NI_BS_LTE_FO3#">How to handle texture borders.</add>
     </niobject>
@@ -6404,7 +6404,7 @@
 
     <niobject name="bhkAabbPhantom" inherit="bhkShapePhantom" versions="#BETHESDA#">
         Bethesda-specific Havok serializable.
-        <add name="Unused Bytes 3" type="byte" arr1="8" />
+        <add name="Unused Bytes 3" type="byte" arr1="8" binary="true" />
         <add name="AABB Min" type="Vector4" />
         <add name="AABB Max" type="Vector4" />
     </niobject>
@@ -6429,12 +6429,12 @@
         <add name="Body" type="Ptr" template="bhkRigidBody" />
         <add name="Unknown Int 1" type="uint" />
         <add name="Unknown Int 2" type="uint" />
-        <add name="Unused 1" type="byte" arr1="8" />
+        <add name="Unused 1" type="byte" arr1="8" binary="true" />
         <add name="Hinge Axis LS" type="Vector4" />
         <add name="Forward LS" type="Vector4" />
         <add name="Strength" type="float" />
         <add name="Damping" type="float" />
-        <add name="Unused 2" type="byte" arr1="8" />
+        <add name="Unused 2" type="byte" arr1="8" binary="true" />
     </niobject>
 
     <niobject name="bhkPoseArray" inherit="NiObject" versions="#FO3_AND_LATER#">
@@ -6566,15 +6566,15 @@
 
 
     <niobject name="NiDataStream" inherit="NiObject" since="V20_5_0_0">
-        <add name="Usage" type="DataStreamUsage" abstract="1"></add>
-        <add name="Access" type="DataStreamAccess" abstract="1"></add>
+        <add name="Usage" type="DataStreamUsage" abstract="true"></add>
+        <add name="Access" type="DataStreamAccess" abstract="true"></add>
         <add name="Num Bytes" type="uint">The size in bytes of this data stream.</add>
         <add name="Cloning Behavior" type="CloningBehavior" default="CLONING_SHARE" />
         <add name="Num Regions" type="uint">Number of regions (such as submeshes).</add>
         <add name="Regions" type="Region" arr1="Num Regions">The regions in the mesh. Regions can be used to mark off submeshes which are independent draw calls.</add>
         <add name="Num Components" type="uint">Number of components of the data (matches corresponding field in MeshData).</add>
         <add name="Component Formats" type="ComponentFormat" arr1="Num Components">The format of each component in this data stream.</add>
-        <add name="Data" type="byte" binary="1" arr1="Num Bytes" />
+        <add name="Data" type="byte" binary="true" arr1="Num Bytes" />
         <add name="Streamable" type="bool" default="1" />
     </niobject>
 
@@ -6600,7 +6600,7 @@
         <add name="Component Semantics" type="SemanticData" arr1="Num Components">Describes the semantic of each component.</add>
     </compound>
 
-    <niobject name="NiRenderObject" abstract="1" inherit="NiAVObject" since="V20_5_0_0">
+    <niobject name="NiRenderObject" abstract="true" inherit="NiAVObject" since="V20_5_0_0">
         An object that can be rendered.
         <add name="Material Data" type="MaterialData">Per-material data.</add>
     </niobject>
@@ -6627,7 +6627,7 @@
         <option value="0x8070" name="SYNC_REFLECTIONS">Synchronize after all data necessary to calculate reflections is ready.</option>
     </enum>
 
-    <niobject name="NiMeshModifier" abstract="1" inherit="NiObject">
+    <niobject name="NiMeshModifier" abstract="true" inherit="NiObject">
         Base class for mesh modifiers.
         <add name="Num Submit Points" type="uint" />
         <add name="Submit Points" type="SyncPoint" arr1="Num Submit Points">The sync points supported by this mesh modifier for SubmitTasks.</add>
@@ -6855,7 +6855,7 @@
         <add name="Simulation Steps" type="Ref" template="NiPSSimulatorStep" arr1="Num Simulation Steps" />
     </niobject>
 
-    <niobject name="NiPSSimulatorStep" inherit="NiObject" abstract="1" since="V20_5_0_0">
+    <niobject name="NiPSSimulatorStep" inherit="NiObject" abstract="true" since="V20_5_0_0">
         Abstract base class for a single step in the particle system simulation process.  It has no seralized data.
     </niobject>
 
@@ -6928,14 +6928,14 @@
         <option value="8" name="FORCE_GRAVITY" />
     </enum>
 
-    <niobject name="NiPSForce" abstract="1" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiPSForce" abstract="true" inherit="NiObject" since="V20_5_0_0">
         Abstract base class for all particle forces.
         <add name="Name" type="string" />
         <add name="Type" type="PSForceType" />
         <add name="Active" type="bool" />
     </niobject>
 
-    <niobject name="NiPSFieldForce" abstract="1" inherit="NiPSForce" since="V20_5_0_0">
+    <niobject name="NiPSFieldForce" abstract="true" inherit="NiPSForce" since="V20_5_0_0">
         Abstract base class for all particle field forces.
         <add name="Field Object" type="Ref" template="NiAVObject" />
         <add name="Magnitude" type="float" />
@@ -7014,7 +7014,7 @@
 
     <!-- NiPS Emitters -->
 
-    <niobject name="NiPSEmitter" abstract="1" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiPSEmitter" abstract="true" inherit="NiObject" since="V20_5_0_0">
         Abstract base class for all particle emitters.
         <add name="Name" type="string" />
         <add name="Speed" type="float" />
@@ -7039,7 +7039,7 @@
         <add name="Unknown" type="bool" ver1="30.0.0.0" ver2="30.0.0.1" />
     </niobject>
 
-    <niobject name="NiPSVolumeEmitter" abstract="1" inherit="NiPSEmitter" since="V20_5_0_0">
+    <niobject name="NiPSVolumeEmitter" abstract="true" inherit="NiPSEmitter" since="V20_5_0_0">
         Abstract base class for particle emitters that emit particles from a volume.
         <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
         <add name="Emitter Object" type="Ptr" template="NiAVObject" />
@@ -7089,12 +7089,12 @@
 
     <!-- NiPS Controllers -->
 
-    <niobject name="NiPSEmitterCtlr" abstract="1" inherit="NiSingleInterpController" since="V20_5_0_0">
+    <niobject name="NiPSEmitterCtlr" abstract="true" inherit="NiSingleInterpController" since="V20_5_0_0">
         Abstract base class for all particle emitter time controllers.
         <add name="Emitter Name" type="string" />
     </niobject>
 
-    <niobject name="NiPSEmitterFloatCtlr" abstract="1" inherit="NiPSEmitterCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterFloatCtlr" abstract="true" inherit="NiPSEmitterCtlr" since="V20_5_0_0">
         Abstract base class for controllers that animate a floating point value on an NiPSEmitter object.
     </niobject>
 
@@ -7103,16 +7103,16 @@
         <add name="Emitter Active Interpolator" type="Ref" template="NiInterpolator" />
     </niobject>
 
-    <niobject name="NiPSForceCtlr" abstract="1" inherit="NiSingleInterpController" since="V20_5_0_0">
+    <niobject name="NiPSForceCtlr" abstract="true" inherit="NiSingleInterpController" since="V20_5_0_0">
         Abstract base class for all particle force time controllers.
         <add name="Force Name" type="string" />
     </niobject>
 
-    <niobject name="NiPSForceBoolCtlr" abstract="1" inherit="NiPSForceCtlr" since="V20_5_0_0">
+    <niobject name="NiPSForceBoolCtlr" abstract="true" inherit="NiPSForceCtlr" since="V20_5_0_0">
         Abstract base class for controllers that animate a Boolean value on an NiPSForce object.
     </niobject>
 
-    <niobject name="NiPSForceFloatCtlr" abstract="1" inherit="NiPSForceCtlr" since="V20_5_0_0">
+    <niobject name="NiPSForceFloatCtlr" abstract="true" inherit="NiPSForceCtlr" since="V20_5_0_0">
         Abstract base class for controllers that animate a floating point value on an NiPSForce object.
     </niobject>
 
@@ -7271,7 +7271,7 @@
 
     <!-- NiEvaluator -->
 
-    <niobject name="NiEvaluator" abstract="1" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiEvaluator" abstract="true" inherit="NiObject" since="V20_5_0_0">
         <add name="Node Name" type="string">The name of the animated NiAVObject.</add>
         <add name="Property Type" type="string">The RTTI type of the NiProperty the controller is attached to, if applicable.</add>
         <add name="Controller Type" type="string">The RTTI type of the NiTimeController.</add>
@@ -7287,7 +7287,7 @@
         </add>
     </niobject>
 
-    <niobject name="NiKeyBasedEvaluator" abstract="1" inherit="NiEvaluator" since="V20_5_0_0" />
+    <niobject name="NiKeyBasedEvaluator" abstract="true" inherit="NiEvaluator" since="V20_5_0_0" />
 
     <niobject name="NiBoolEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiBoolData" />
@@ -7623,7 +7623,7 @@
     
     <!-- Fallout 4 Physics -->
 
-    <niobject name="bhkSystem" abstract="1" inherit="NiObject" versions="#FO4#">
+    <niobject name="bhkSystem" abstract="true" inherit="NiObject" versions="#FO4#">
         Fallout 4 Physics System
     </niobject>
     

From 285b1cb45d022d040acccbb9cae0138d3745f1e0 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 19 Jun 2018 08:21:44 -0400
Subject: [PATCH 51/86] bhk block cleanup, decoding, inheritance fixes

Havok serialization is separate from inheritance and so certain shapes that are actually convex were not considered such by nif.xml, which in turn excludes them from uses of `template="bhkConvexShape"`.

Created a fake base class to fix these issues.  Also, bhkConvexTransformShape no longer inheriting bhkTransformShape was more correct anyway, as the Ref type could be made more specific (bhkConvexShape).

Did some comment/description cleanup and some minor decoding.
---
 nif.xml | 57 +++++++++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/nif.xml b/nif.xml
index d607428..ea8d56f 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2676,7 +2676,11 @@
         <add name="Transform" type="Matrix44">A transform matrix.</add>
     </niobject>
 
-    <niobject name="bhkSphereRepShape" abstract="true" inherit="bhkShape" versions="#BETHESDA#">
+    <niobject name="bhkConvexShapeBase" abstract="true" inherit="bhkShape" versions="#BETHESDA#">
+        An imaginary abstract base to solve inheritance issues in nif.xml with Havok serialization not matching class hierarchy.
+    </niobject>
+
+    <niobject name="bhkSphereRepShape" abstract="true" inherit="bhkConvexShapeBase" versions="#BETHESDA#">
         An interface that produces a set of spheres that represent a simplified version of the shape.
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
     </niobject>
@@ -2741,13 +2745,18 @@
         <add name="Normals" type="Vector4" arr1="Num Normals">Half spaces as determined by the set of vertices above. First three components define the normal pointing to the exterior, fourth component is the signed distance of the separating plane to the origin: it is minus the dot product of v and n, where v is any vertex on the separating plane, and n is the normal. Lexicographically sorted.</add>
     </niobject>
 
-    <niobject name="bhkConvexTransformShape" inherit="bhkTransformShape" versions="#BETHESDA#">
-        Contains a bhkShape and an additional transform for that shape.
+    <niobject name="bhkConvexTransformShape" inherit="bhkConvexShapeBase" versions="#BETHESDA#">
+        Contains a bhkConvexShape and an additional transform for that shape.
         The advantage of using bhkConvexTransformShape over bhkTransformShape is that it does not require additional agents to be created as it is itself convex.
+        <add name="Shape" type="Ref" template="bhkConvexShape">The shape that this object transforms.</add>
+        <add name="Material" type="HavokMaterial">The material of the shape.</add>
+        <add name="Radius" type="float" />
+        <add name="Unused" type="byte" arr1="8" binary="true">Garbage data from memory.</add>
+        <add name="Transform" type="Matrix44">A transform matrix.</add>
     </niobject>
 
-    <niobject name="bhkConvexSweepShape" inherit="bhkShape" versions="V10_0_1_0">
-        <add name="Shape" type="Ref" template="bhkShape" />
+    <niobject name="bhkConvexSweepShape" inherit="bhkConvexShapeBase" versions="V10_0_1_0">
+        <add name="Shape" type="Ref" template="bhkConvexShape" />
         <add name="Material" type="HavokMaterial" />
         <add name="Radius" type="float" />
         <add name="Unknown" type="Vector3" />
@@ -2758,11 +2767,9 @@
         However, if two bhkMultiSphereShape collide, every sphere needs to be checked against every other sphere.
             Example: 10 spheres colliding with 10 spheres will result in 100 collision checks.
             Therefore shapes like bhkCapsuleShape or bhkConvexVerticesShape should be preferred.
-        <add name="Radius" type="float">The radius of the sphere that encloses the shape.</add>
-        <add name="Unknown Float 1" type="float" />
-        <add name="Unknown Float 2" type="float" />
-        <add name="Num Spheres" type="uint">The number of spheres in this multi sphere shape.</add>
-        <add name="Spheres" type="NiBound" arr1="Num Spheres">This array holds the spheres which make up the multi sphere shape.</add>
+        <add name="Shape Property" type="hkWorldObjCinfoProperty" />
+        <add name="Num Spheres" type="uint" />
+        <add name="Spheres" type="NiBound" arr1="Num Spheres">The spheres which make up the multi sphere shape. Max of 8.</add>
     </niobject>
 
     <niobject name="bhkBvTreeShape" abstract="true" inherit="bhkShape" versions="#BETHESDA#">
@@ -2795,12 +2802,12 @@
 
         Also, shapes collected in a bhkListShape may not have the correct
         walking noise, so only use it for non-walkable objects.
-        <add name="Num Sub Shapes" type="uint">The number of sub shapes referenced.</add>
-        <add name="Sub Shapes" type="Ref" template="bhkShape" arr1="Num Sub Shapes">List of shapes.</add>
+        <add name="Num Sub Shapes" type="uint" />
+        <add name="Sub Shapes" type="Ref" template="bhkShape" arr1="Num Sub Shapes">List of shapes. Max of 256.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Child Shape Property" type="hkWorldObjCinfoProperty" />
         <add name="Child Filter Property" type="hkWorldObjCinfoProperty" />
-        <add name="Num Unknown Ints" type="uint">Count.</add>
+        <add name="Num Unknown Ints" type="uint" />
         <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" />
     </niobject>
 
@@ -6216,24 +6223,26 @@
         <add name="Interpolator" type="Ref" template="NiInterpolator" ver1="20.2.0.7" />
     </niobject>
 
-    <niobject name="bhkConvexListShape" inherit="bhkShape" versions="#FO3#">
-        A havok shape.
-        A list of convex shapes.
+    <niobject name="bhkConvexListShape" inherit="bhkConvexShapeBase" versions="#FO3#">
+        A list of shapes. However,
+            - The sub shapes must ALL be convex: Sphere, Capsule, Cylinder, Convex Vertices, Convex Transform
+            - The radius of all shapes must be identical
+            - The number of sub shapes is restricted to 255
+            - The number of vertices of each sub shape is restricted to 255
 
-        Do not put a bhkPackedNiTriStripsShape in the Sub Shapes. Use a
-        separate collision nodes without a list shape for those.
-
-        Also, shapes collected in a bhkListShape may not have the correct
-        walking noise, so only use it for non-walkable objects.
+        For this reason you most likely cannot combine Sphere Shapes, Capsule Shapes, and Convex Vertices Shapes,
+        as their Radius values differ in function. (Sphere/Capsule radius = physical size, CVS radius = padding/shell)
+        
+        Shapes collected in a bhkConvexListShape may not have the correct material noise.
         <add name="Num Sub Shapes" type="uint" />
-        <add name="Sub Shapes" type="Ref" template="bhkConvexShape" arr1="Num Sub Shapes">List of shapes.</add>
+        <add name="Sub Shapes" type="Ref" template="bhkConvexShapeBase" arr1="Num Sub Shapes">List of shapes. Max of 255.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float" />
         <add name="Unknown Int 1" type="uint" />
         <add name="Unknown Float 1" type="float" />
         <add name="Child Shape Property" type="hkWorldObjCinfoProperty" />
-        <add name="Unknown Byte 1" type="byte" />
-        <add name="Unknown Float 2" type="float" />
+        <add name="Use Cached AABB" type="bool">If true, an AABB of the children's AABBs is used, which is faster but larger than building an AABB from each child.</add>
+        <add name="Closest Point Min Distance" type="float">A distance which is used for getClosestPoint(). If the object being tested is closer, the children are recursed. Otherwise it returns this value.</add>
     </niobject>
 
     <compound name="BSTreadTransform" size="68" versions="#FO3_AND_LATER#">

From 639bea61449b32cd51ed4c867bc68d03da228cc0 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 19 Jun 2018 08:32:53 -0400
Subject: [PATCH 52/86] BSLightingShader decoding

FO4 DLC uses BSLightingShaderPropertyUShortController in 2 NIFs, but according to the CK it is not actually a functional block and spits out constant warnings. It is still needed in nif.xml for serialization though.

FO4 also adds two booleans for Env Map shader type for SSR.  These were previously marked as an Unknown Short.  These booleans are *not* synced with their values in the BGSM files except for generated meshes such as SCOL and precombined.
---
 nif.xml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/nif.xml b/nif.xml
index ea8d56f..0b99af6 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1294,7 +1294,7 @@
         <option value="0" name="Emissive Color">Emissive Color.</option>
     </enum>
 
-    <enum name="LightingShaderControlledVariable" storage="uint" prefix="LSCV" versions="#SKY_AND_LATER#">
+    <enum name="LightingShaderControlledFloat" storage="uint" prefix="LSCF" versions="#SKY_AND_LATER#">
         An unsigned 32-bit integer, describing which float variable in BSLightingShaderProperty to animate.
         <option value="0" name="Refraction Strength">The amount of distortion.</option>
         <option value="8" name="Environment Map Scale">Environment Map Scale.</option>
@@ -1308,6 +1308,12 @@
         <option value="23" name="V Scale">V Scale.</option>
     </enum>
 
+    <enum name="LightingShaderControlledUShort" storage="uint" prefix="LSCU" versions="#SKY_AND_LATER#">
+        An unsigned 32-bit integer, describing which integral value in BSLightingShaderProperty to animate.
+        <option value="0" name="Unknown 1" />
+        <option value="1" name="Unknown 2" />
+    </enum>
+
     <enum name="LightingShaderControlledColor" storage="uint" prefix="LSCC" versions="#SKY_AND_LATER#">
         An unsigned 32-bit integer, describing which color in BSLightingShaderProperty to animate.
         <option value="0" name="Specular Color">Specular Color.</option>
@@ -5747,22 +5753,28 @@
 
     <niobject name="BSEffectShaderPropertyFloatController" inherit="NiFloatInterpController" versions="#SKY_AND_LATER#">
         This controller is used to animate float variables in BSEffectShaderProperty.
-        <add name="Type of Controlled Variable" type="EffectShaderControlledVariable">Which float variable in BSEffectShaderProperty to animate:</add>
+        <add name="Controlled Variable" type="EffectShaderControlledVariable">Which float variable in BSEffectShaderProperty to animate.</add>
     </niobject>
 	
 	<niobject name="BSEffectShaderPropertyColorController" inherit="NiPoint3InterpController" versions="#SKY_AND_LATER#">
 		This controller is used to animate colors in BSEffectShaderProperty.
-		<add name="Type of Controlled Color" type="EffectShaderControlledColor">Which color in BSEffectShaderProperty to animate:</add>
+		<add name="Controlled Color" type="EffectShaderControlledColor">Which color in BSEffectShaderProperty to animate.</add>
 	</niobject>
 	
 	<niobject name="BSLightingShaderPropertyFloatController" inherit="NiFloatInterpController" versions="#SKY_AND_LATER#">
 		This controller is used to animate float variables in BSLightingShaderProperty.
-		<add name="Type of Controlled Variable" type="LightingShaderControlledVariable">Which float variable in BSLightingShaderProperty to animate:</add>
+		<add name="Controlled Variable" type="LightingShaderControlledFloat">Which float variable in BSLightingShaderProperty to animate.</add>
 	</niobject>
-	
+
+	<niobject name="BSLightingShaderPropertyUShortController" inherit="NiFloatInterpController" versions="#SKY_AND_LATER#">
+		This controller is used to animate float variables in BSLightingShaderProperty.
+		NOTE: FO4 CK reports this block as unsupported.
+		<add name="Controlled Variable" type="LightingShaderControlledUShort">NOTE: FO4 CK reports this as unsupported. Which integral variable in BSLightingShaderProperty to animate.</add>
+	</niobject>
+
 	<niobject name="BSLightingShaderPropertyColorController" inherit="NiPoint3InterpController" versions="#SKY_AND_LATER#">
 		This controller is used to animate colors in BSLightingShaderProperty.
-		<add name="Type of Controlled Color" type="LightingShaderControlledColor">Which color in BSLightingShaderProperty to animate:</add>
+		<add name="Controlled Color" type="LightingShaderControlledColor">Which color in BSLightingShaderProperty to animate.</add>
 	</niobject>	
 	
 	<niobject name="BSNiAlphaPropertyTestRefController" inherit="NiFloatInterpController" versions="#BETHESDA#" />
@@ -6034,7 +6046,8 @@
         <add name="Wetness Fresnel Power" type="float" default="-1.0" vercond="#BS_FO4#" />
         <add name="Wetness Metalness" type="float" default="-1.0" vercond="#BS_FO4#" />
         <add name="Environment Map Scale" type="float" default="1.0" cond="Skyrim Shader Type == 1">Scales the intensity of the environment/cube map. (0-1)</add>
-        <add name="Unknown Env Map Short" type="ushort" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
+        <add name="Use Screen Space Reflections" type="bool" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
+        <add name="Wetness Control: Use SSR" type="bool" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
         <add name="Skin Tint Color" type="Color3" cond="Skyrim Shader Type == 5">Tints the base texture. Overridden by game settings.</add>
         <add name="Unknown Skin Tint Int" type="uint" cond="Skyrim Shader Type == 5" vercond="#BS_FO4#" />
         <add name="Hair Tint Color" type="Color3" cond="Skyrim Shader Type == 6">Tints the base texture. Overridden by game settings.</add>

From 121ba5f7d82aafb0db033b7cac794d09b0b6d629 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Mon, 25 Jun 2018 06:25:37 -0400
Subject: [PATCH 53/86] Replace `calculated` with `calc`

For #76.  `calc` does not need to be supported and is only used for pre-serialization preparation of the data.  This can also be done by hand.

Some revisions also need to be made for #70 and #73 to account for another attribute with its own expression grammar and tokens.

However, the tokens introduced for `calc` will not be added to the tokens in the XML and will need to be explicitly supported if supporting `calc`.  They are:

1D array size (uses regex): `#LEN[(.*?)]#`
2D array size (uses regex): `#LEN2[(.*?)]#`

Ternary `?`: `#THEN#`
Ternary `:`: `#ELSE#`

Also removes any unnecessary `calculated` without replacement.

Additionally, `calc` is used to limit array size for the time being, though it's possible this should be done with its own attribute, such as `maxlen`.
---
 nif.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/nif.xml b/nif.xml
index 0b99af6..c5eb978 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1916,7 +1916,7 @@
     <compound name="SkinPartition" since="V4_2_1_0">
         Skinning data for a submesh, optimized for hardware skinning. Part of NiSkinPartition.
         <add name="Num Vertices" type="ushort">Number of vertices in this submesh.</add>
-        <add name="Num Triangles" type="ushort" calculated="1">Number of triangles in this submesh.</add>
+        <add name="Num Triangles" type="ushort" calc="(#LEN2[Strips]# #GT# 0) #THEN# (#LEN2[Strips]# - 2) #ELSE# (#LEN[Triangles]#)">Number of triangles in this submesh.</add>
         <add name="Num Bones" type="ushort">Number of bones influencing this submesh.</add>
         <add name="Num Strips" type="ushort">Number of strips in this submesh (zero if not stripped).</add>
         <add name="Num Weights Per Vertex" type="ushort">Number of weight coefficients per vertex. The Gamebryo engine seems to work well only if this number is equal to 4, even if there are less than 4 influences per vertex.</add>
@@ -1928,7 +1928,7 @@
         <add name="Vertex Weights" type="float" arr1="Num Vertices" arr2="Num Weights Per Vertex" ver2="10.0.1.2">The vertex weights.</add>
         <add name="Vertex Weights" type="float" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Vertex Weights" ver1="10.1.0.0">The vertex weights.</add>
         <add name="Strip Lengths" type="ushort" arr1="Num Strips">The strip lengths.</add>
-        <add name="Has Faces" type="bool" ver1="10.1.0.0">Do we have triangle or strip data?</add>
+        <add name="Has Faces" type="bool" calc="(#LEN[Strips]# #ADD# #LEN[Triangles]# #GT# 0) #THEN# 1 #ELSE# 0" ver1="10.1.0.0">Do we have triangle or strip data?</add>
         <add name="Strips" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="Num Strips != 0" ver2="10.0.1.2">The strips.</add>
         <add name="Strips" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="(Has Faces) #AND# (Num Strips != 0)" ver1="10.1.0.0">The strips.</add>
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Num Strips == 0" ver2="10.0.1.2">The triangles.</add>
@@ -2774,7 +2774,7 @@
             Example: 10 spheres colliding with 10 spheres will result in 100 collision checks.
             Therefore shapes like bhkCapsuleShape or bhkConvexVerticesShape should be preferred.
         <add name="Shape Property" type="hkWorldObjCinfoProperty" />
-        <add name="Num Spheres" type="uint" />
+        <add name="Num Spheres" type="uint" calc="(#LEN[Spheres]# #LT# 8) #THEN# #LEN[Spheres]# #ELSE# 8" />
         <add name="Spheres" type="NiBound" arr1="Num Spheres">The spheres which make up the multi sphere shape. Max of 8.</add>
     </niobject>
 
@@ -2788,7 +2788,7 @@
         <add name="Shape" type="Ref" template="bhkShape">The shape.</add>
         <add name="Unused" type="uint" arr1="3">Garbage data from memory. Referred to as User Data, Shape Collection, and Code.</add>
         <add name="Shape Scale" type="float" default="1.0">Scale.</add>
-        <add name="MOPP Data Size" type="uint" calculated="1">Number of bytes for MOPP data.</add>
+        <add name="MOPP Data Size" type="uint">Number of bytes for MOPP data.</add>
         <add name="Origin" type="Vector3" ver1="10.1.0.0">Origin of the object in mopp coordinates. This is the minimum of all vertices in the packed shape along each axis, minus 0.1.</add>
         <add name="Scale" type="float" ver1="10.1.0.0">The scaling factor to quantize the MOPP: the quantization factor is equal to 256*256 divided by this number. In Oblivion files, scale is taken equal to 256*256*254 / (size + 0.2) where size is the largest dimension of the bounding box of the packed shape.</add>
         <add name="Build Type" type="MoppDataBuildType" vercond="#BS_GT_FO3#">Tells if MOPP Data was organized into smaller chunks (PS3) or not (PC)</add>
@@ -2808,12 +2808,12 @@
 
         Also, shapes collected in a bhkListShape may not have the correct
         walking noise, so only use it for non-walkable objects.
-        <add name="Num Sub Shapes" type="uint" />
+        <add name="Num Sub Shapes" type="uint" calc="(#LEN[Sub Shapes]# #LT# 256) #THEN# #LEN[Sub Shapes]# #ELSE# 256" />
         <add name="Sub Shapes" type="Ref" template="bhkShape" arr1="Num Sub Shapes">List of shapes. Max of 256.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Child Shape Property" type="hkWorldObjCinfoProperty" />
         <add name="Child Filter Property" type="hkWorldObjCinfoProperty" />
-        <add name="Num Unknown Ints" type="uint" />
+        <add name="Num Unknown Ints" type="uint" calc="#LEN[Sub Shapes]#" />
         <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" />
     </niobject>
 
@@ -4667,8 +4667,8 @@
         Skinning data, optimized for hardware skinning. The mesh is partitioned in submeshes such that each vertex of a submesh is influenced only by a limited and fixed number of bones.
         <add name="Num Skin Partition Blocks" type="uint" />
 		<add name="Skin Partition Blocks" type="SkinPartition" arr1="Num Skin Partition Blocks" vercond="!#BS_SSE#">Skin partition objects.</add>
-		<add name="Data Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
-		<add name="Vertex Size" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<add name="Data Size" type="uint" calc="#LEN[Vertex Data]# #MUL# Vertex Size" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<add name="Vertex Size" type="uint" calc="(Vertex Desc #BITAND# 0xF) #MUL# 4" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" arr1="Data Size / Vertex Size" cond="Data Size #GT# 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
@@ -4860,7 +4860,7 @@
     <niobject name="NiTriShapeData" inherit="NiTriBasedGeomData">
         Holds mesh data using a list of singular triangles.
         <add name="Num Triangle Points" type="uint">Num Triangles times 3.</add>
-        <add name="Has Triangles" type="bool" ver1="10.1.0.0" calculated="1">Do we have triangle data?</add>
+        <add name="Has Triangles" type="bool" ver1="10.1.0.0">Do we have triangle data?</add>
         <add name="Triangles" type="Triangle" arr1="Num Triangles" ver2="10.0.1.2">Triangle data.</add>
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Has Triangles" ver1="10.0.1.3">Triangle face data.</add>
         <add name="Num Match Groups" type="ushort" ver1="3.1">Number of shared normals groups.</add>
@@ -6247,7 +6247,7 @@
         as their Radius values differ in function. (Sphere/Capsule radius = physical size, CVS radius = padding/shell)
         
         Shapes collected in a bhkConvexListShape may not have the correct material noise.
-        <add name="Num Sub Shapes" type="uint" />
+        <add name="Num Sub Shapes" type="uint" calc="(#LEN[Sub Shapes]# #LT# 255) #THEN# #LEN[Sub Shapes]# #ELSE# 255" />
         <add name="Sub Shapes" type="Ref" template="bhkConvexShapeBase" arr1="Num Sub Shapes">List of shapes. Max of 255.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float" />
@@ -7598,11 +7598,11 @@
         <add name="Num Triangles" type="uint" vercond="#BS_FO4#" />
         <add name="Num Triangles" type="ushort" vercond="#NI_BS_LT_FO4#" />
         <add name="Num Vertices" type="ushort" />
-        <add name="Data Size" type="uint" />
+        <add name="Data Size" type="uint" calc="((Vertex Desc #BITAND# 0xF) #MUL# Num Vertices #MUL# 4) #ADD# (Num Triangles #MUL# 6)" />
         <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size #GT# 0" vercond="#BS_FO4#" />
         <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size #GT# 0" vercond="#BS_SSE#" />
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size #GT# 0" />
-        <add name="Particle Data Size" type="uint" vercond="#BS_SSE#" />
+        <add name="Particle Data Size" type="uint" calc="(Num Vertices #MUL# 6) #ADD# (Num Triangles #MUL# 3)" vercond="#BS_SSE#" />
         <add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
         <add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
         <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
@@ -7618,7 +7618,7 @@
     <compound name="BSGeometryPerSegmentSharedData" size="16" versions="#FO4#">
         <add name="User Index" type="uint">If Bone ID is 0xffffffff, this value refers to the Segment at the listed index. Otherwise this is the "Biped Object", which is like the body part types in Skyrim and earlier.</add>
         <add name="Bone ID" type="uint">A hash of the bone name string.</add>
-        <add name="Num Cut Offsets" type="uint">Maximum of 8.</add>
+        <add name="Num Cut Offsets" type="uint" calc="(#LEN[Cut Offsets]# #LT# 8) #THEN# #LEN[Cut Offsets]# #ELSE# 8">Maximum of 8.</add>
         <add name="Cut Offsets" type="float" arr1="Num Cut Offsets" />
     </compound>
 
@@ -7634,7 +7634,7 @@
 
     <niobject name="BSSubIndexTriShape" inherit="BSTriShape" versions="#SSE# #FO4#">
         Fallout 4 Sub-Index Tri Shape
-		<add name="Num Primitives" type="uint" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
+		<add name="Num Primitives" type="uint" calc="#LEN[Triangles]#" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
 		<add name="Num Segments" type="uint" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
 		<add name="Total Segments" type="uint" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
 		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_FO4#" arr1="Num Segments" cond="Data Size #GT# 0" />
@@ -7814,7 +7814,7 @@
 	<!-- Skyrim SE --> 
 
 	<niobject name="BSDynamicTriShape" inherit="BSTriShape" versions="#SSE#">
-		<add name="Dynamic Data Size" type="uint" />
+		<add name="Dynamic Data Size" type="uint" calc="Num Vertices #MUL# 16" />
 		<add name="Vertices" type="Vector4" arr1="Dynamic Data Size / 16" />
 	</niobject>
 	

From 61d2b796880c278dc3d9510bc38a44d0a37b2813 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Mon, 25 Jun 2018 12:42:56 -0400
Subject: [PATCH 54/86] NiSkinPartition (Bethesda) decoding and cleanup

Unknown Short for FO3+ was two values, a byte and a bool.

Renamed "Num Skin Partition Blocks" and "Skin Partition Blocks" and combined the Partitions array into one row, as having a row separate for SSE was unnecessary.
---
 nif.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nif.xml b/nif.xml
index c5eb978..ea557ea 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1919,7 +1919,7 @@
         <add name="Num Triangles" type="ushort" calc="(#LEN2[Strips]# #GT# 0) #THEN# (#LEN2[Strips]# - 2) #ELSE# (#LEN[Triangles]#)">Number of triangles in this submesh.</add>
         <add name="Num Bones" type="ushort">Number of bones influencing this submesh.</add>
         <add name="Num Strips" type="ushort">Number of strips in this submesh (zero if not stripped).</add>
-        <add name="Num Weights Per Vertex" type="ushort">Number of weight coefficients per vertex. The Gamebryo engine seems to work well only if this number is equal to 4, even if there are less than 4 influences per vertex.</add>
+        <add name="Num Weights Per Vertex" type="ushort" default="4">Number of weight coefficients per vertex. The Gamebryo engine seems to work well only if this number is equal to 4, even if there are less than 4 influences per vertex.</add>
         <add name="Bones" type="ushort" arr1="Num Bones">List of bones.</add>
         <add name="Has Vertex Map" type="bool" ver1="10.1.0.0">Do we have a vertex map?</add>
         <add name="Vertex Map" type="ushort" arr1="Num Vertices" ver2="10.0.1.2">Maps the weight/influence lists in this submesh to the vertices in the shape being skinned.</add>
@@ -1935,7 +1935,8 @@
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="(Has Faces) #AND# (Num Strips == 0)" ver1="10.1.0.0">The triangles.</add>
         <add name="Has Bone Indices" type="bool">Do we have bone indices?</add>
         <add name="Bone Indices" type="byte" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Bone Indices">Bone indices, they index into 'Bones'.</add>
-		<add name="Unknown Short" type="ushort" vercond="#BS_GT_FO3#" />
+        <add name="LOD Level" type="byte" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <add name="Global VB" type="bool" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
 		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
     </compound>
@@ -4665,13 +4666,12 @@
 
     <niobject name="NiSkinPartition" inherit="NiObject">
         Skinning data, optimized for hardware skinning. The mesh is partitioned in submeshes such that each vertex of a submesh is influenced only by a limited and fixed number of bones.
-        <add name="Num Skin Partition Blocks" type="uint" />
-		<add name="Skin Partition Blocks" type="SkinPartition" arr1="Num Skin Partition Blocks" vercond="!#BS_SSE#">Skin partition objects.</add>
+        <add name="Num Partitions" type="uint" />
 		<add name="Data Size" type="uint" calc="#LEN[Vertex Data]# #MUL# Vertex Size" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Vertex Size" type="uint" calc="(Vertex Desc #BITAND# 0xF) #MUL# 4" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" arr1="Data Size / Vertex Size" cond="Data Size #GT# 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
-		<add name="Partition" type="SkinPartition" arr1="Num Skin Partition Blocks" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<add name="Partitions" type="SkinPartition" arr1="Num Partitions" />
     </niobject>
 
     <niobject name="NiTexture" abstract="true" inherit="NiObjectNET">

From 8d73ad09685e88d17a29fa6ef5c9411cfeca6ab4 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Mon, 25 Jun 2018 12:52:18 -0400
Subject: [PATCH 55/86] Explicit ver1/ver2 for BS 20.2

Specifying ver1/ver2 even for `vercond="#BS...` for FO3 and later allows early rejection of that member for any non-BS 20.2 NIFs.
---
 nif.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nif.xml b/nif.xml
index ea557ea..558073c 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2999,7 +2999,7 @@
 
     <niobject name="NiObjectNET" abstract="true" inherit="NiObject">
         Abstract base class for NiObjects that support names, extra data, and time controllers.
-        <add name="Skyrim Shader Type" type="BSLightingShaderPropertyShaderType" vercond="#BS_GTE_SKY#" onlyT="BSLightingShaderProperty">Configures the main shader path</add>
+        <add name="Skyrim Shader Type" type="BSLightingShaderPropertyShaderType" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SKY#" onlyT="BSLightingShaderProperty">Configures the main shader path</add>
         <add name="Name" type="string">Name of this controllable object, used to refer to the object in .kf files.</add>
         <add name="Legacy Extra Data" type="LegacyExtraData" ver2="2.3" />
         <add name="Extra Data" type="Ref" template="NiExtraData" ver1="3.0" ver2="4.2.2.0">Extra data object index. (The first in a chain)</add>
@@ -3397,14 +3397,14 @@
             Most new blocks (e.g. BSTriShape) do not refer to NiGeometry except NiParticleSystem was changed to use BSGeometry.
             This causes massive inheritance problems so the rows below are doubled up to exclude NiParticleSystem for Bethesda Stream 100+
             and to add data exclusive to BSGeometry.
-        <add name="Bound" type="NiBound" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
-        <add name="Skin" type="Ref" template="NiObject" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
+        <add name="Bound" type="NiBound" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
+        <add name="Skin" type="Ref" template="NiObject" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
         <add name="Data" type="Ref" template="NiGeometryData" vercond="#NI_BS_LT_SSE#">Data index (NiTriShapeData/NiTriStripData).</add>
-        <add name="Data" type="Ref" template="NiGeometryData" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</add>
+        <add name="Data" type="Ref" template="NiGeometryData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</add>
         <add name="Skin Instance" type="Ref" template="NiSkinInstance" ver1="3.3.0.13" vercond="#NI_BS_LT_SSE#" />
-        <add name="Skin Instance" type="Ref" template="NiSkinInstance" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
+        <add name="Skin Instance" type="Ref" template="NiSkinInstance" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
         <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#NI_BS_LT_SSE#" />
-        <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
+        <add name="Material Data" type="MaterialData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
         <add name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
         <add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
     </niobject>
@@ -3460,7 +3460,7 @@
         <add name="Group ID" type="int" ver1="10.1.0.114">Always zero.</add>
         <add name="Num Vertices" type="ushort" excludeT="NiPSysData">Number of vertices.</add>
         <add name="Num Vertices" type="ushort" onlyT="NiPSysData" vercond="#NI_BS_LT_FO3#">Number of vertices.</add>
-        <add name="BS Max Vertices" type="ushort" onlyT="NiPSysData" vercond="#BS_GTE_FO3#">Bethesda uses this for max number of particles in NiPSysData.</add>
+        <add name="BS Max Vertices" type="ushort" onlyT="NiPSysData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_FO3#">Bethesda uses this for max number of particles in NiPSysData.</add>
         <add name="Keep Flags" type="byte" ver1="10.1.0.0">Used with NiCollision objects when OBB or TRI is set.</add>
         <add name="Compress Flags" type="byte" ver1="10.1.0.0" />
         <add name="Has Vertices" type="bool" default="1">Is the vertex array present? (Always non-zero.)</add>
@@ -4372,7 +4372,7 @@
         <add name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</add>
         <add name="Fade Time" type="float">The time taken to shrink from their specified size to 0.</add>
         <add name="Fade Generation" type="ushort">Specifies the particle generation to which the shrink effect should be applied. This is usually the highest supported generation for the particle system.</add>
-        <add name="Base Scale" type="float" vercond="#BS_GTE_FO3#">A multiplier on the base particle scale.</add>
+        <add name="Base Scale" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_FO3#">A multiplier on the base particle scale.</add>
     </niobject>
 
     <niobject name="NiPSysMeshEmitter" inherit="NiPSysEmitter">
@@ -6233,7 +6233,7 @@
 
     <niobject name="BSRefractionFirePeriodController" inherit="NiTimeController" versions="#FO3#">
         Bethesda-specific time controller.
-        <add name="Interpolator" type="Ref" template="NiInterpolator" ver1="20.2.0.7" />
+        <add name="Interpolator" type="Ref" template="NiInterpolator" />
     </niobject>
 
     <niobject name="bhkConvexListShape" inherit="bhkConvexShapeBase" versions="#FO3#">

From 086024bc53ba8bf4382317984ff233ed90dad4cd Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 26 Jun 2018 14:41:19 -0400
Subject: [PATCH 56/86] NiGeometryData flags bitfield

Use a correct bitfield for NiGeometryData flags now that we know what the unknown values are for Bethesda bhk data. (NiGeometryData that gets used in a bhk shape)
---
 nif.xml | 70 +++++++++++++++++++++------------------------------------
 1 file changed, 26 insertions(+), 44 deletions(-)

diff --git a/nif.xml b/nif.xml
index 558073c..9fc060a 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1451,6 +1451,26 @@
         <member width="3" pos="1" mask="0x0006" name="Consistency Type" type="AGDConsistencyType" default="AGD_MUTABLE" />
     </bitfield>
 
+    <enum name="NiNBTMethod" storage="ushort">
+        <option value="0" name="NBT_METHOD_NONE" />
+        <option value="1" name="NBT_METHOD_NDL" />
+        <option value="2" name="NBT_METHOD_MAX" />
+        <option value="3" name="NBT_METHOD_ATI" />
+    </enum>
+
+    <bitfield name="NiGeometryDataFlags" storage="ushort">
+        <member width="6" pos="0" mask="0x003F" name="Num UV Sets" type="bool" />
+        <member width="6" pos="6" mask="0x0FC0" name="Havok Material" type="ushort">Unused for non-Bethesda, non-bhk NiGeometryData.</member>
+        <member width="2" pos="12" mask="0xF000" name="NBT Method" type="NiNBTMethod" />
+    </bitfield>
+
+    <bitfield name="BSGeometryDataFlags" storage="ushort">
+        <member width="6" pos="0" mask="0x0001" name="Has UV" type="bool" />
+        <member width="6" pos="6" mask="0x0FC0" name="Havok Material" type="ushort" />
+        <member width="1" pos="12" mask="0x1000" name="Has Tangents" type="bool" />
+    </bitfield>
+
+
     <!--Compounds
         These are like C structures and are used as sub-parts of more complex
         classes when there are multiple pieces of data repeated in an array.-->
@@ -3413,44 +3433,6 @@
         Describes a mesh, built from triangles.
     </niobject>
 
-    <bitflags name="VectorFlags" storage="ushort" prefix="VF">
-        <option value="0" name="UV_1" />
-        <option value="1" name="UV_2" />
-        <option value="2" name="UV_4" />
-        <option value="3" name="UV_8" />
-        <option value="4" name="UV_16" />
-        <option value="5" name="UV_32" />
-        <option value="6" name="Unk64" />
-        <option value="7" name="Unk128" />
-        <option value="8" name="Unk256" />
-        <option value="9" name="Unk512" />
-        <option value="10" name="Unk1024" />
-        <option value="11" name="Unk2048" />
-        <option value="12" name="Has_Tangents" />
-        <option value="13" name="Unk8192" />
-        <option value="14" name="Unk16384" />
-        <option value="15" name="Unk32768" />
-    </bitflags>
-    
-    <bitflags name="BSVectorFlags" storage="ushort" prefix="BSVF" versions="#BETHESDA#">
-        <option value="0" name="Has_UV" />
-        <option value="1" name="Unk2" />
-        <option value="2" name="Unk4" />
-        <option value="3" name="Unk8" />
-        <option value="4" name="Unk16" />
-        <option value="5" name="Unk32" />
-        <option value="6" name="Unk64" />
-        <option value="7" name="Unk128" />
-        <option value="8" name="Unk256" />
-        <option value="9" name="Unk512" />
-        <option value="10" name="Unk1024" />
-        <option value="11" name="Unk2048" />
-        <option value="12" name="Has_Tangents" />
-        <option value="13" name="Unk8192" />
-        <option value="14" name="Unk16384" />
-        <option value="15" name="Unk32768" />
-    </bitflags>
-
     <niobject name="NiGeometryData" abstract="true" inherit="NiObject">
         Mesh data: vertices, vertex normals, etc.
             Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly. 
@@ -3465,13 +3447,13 @@
         <add name="Compress Flags" type="byte" ver1="10.1.0.0" />
         <add name="Has Vertices" type="bool" default="1">Is the vertex array present? (Always non-zero.)</add>
         <add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Has Vertices">The mesh vertices.</add>
-        <add name="Vector Flags" type="VectorFlags" ver1="10.0.1.0" vercond="!#BS202#" />
-        <add name="BS Vector Flags" type="BSVectorFlags" vercond="#BS202#" />
+        <add name="Data Flags" type="NiGeometryDataFlags" ver1="10.0.1.0" vercond="!#BS202#" />
+        <add name="BS Data Flags" type="BSGeometryDataFlags" vercond="#BS202#" />
         <add name="Material CRC" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
         <add name="Has Normals" type="bool">Do we have lighting normals? These are essential for proper lighting: if not present, the model will only be influenced by ambient light.</add>
         <add name="Normals" type="Vector3" arr1="Num Vertices" cond="Has Normals">The lighting normals.</add>
-        <add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) #AND# ((Vector Flags | BS Vector Flags) #BITAND# 4096)" ver1="10.1.0.0">Tangent vectors.</add>
-        <add name="Bitangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) #AND# ((Vector Flags | BS Vector Flags) #BITAND# 4096)" ver1="10.1.0.0">Bitangent vectors.</add>
+        <add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) #AND# ((Data Flags | BS Data Flags) #BITAND# 4096)" ver1="10.1.0.0">Tangent vectors.</add>
+        <add name="Bitangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) #AND# ((Data Flags | BS Data Flags) #BITAND# 4096)" ver1="10.1.0.0">Bitangent vectors.</add>
         <add name="Has DIV2 Floats" type="bool" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
         <add name="DIV2 Floats" type="float" arr1="Num Vertices" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" cond="Has DIV2 Floats" />
         <add name="Bounding Sphere" type="NiBound" />
@@ -3483,13 +3465,13 @@
             Note 2: set to either 0 or 0xFFFFFFFF for NifTexture compatibility.
         </add>
         <add name="Vertex Colors" type="Color4" arr1="Num Vertices" cond="Has Vertex Colors">The vertex colors.</add>
-        <add name="Num UV Sets" type="ushort" ver2="4.2.2.0">The lower 6 (or less?) bits of this field represent the number of UV texture sets. The other bits are probably flag bits. For versions 10.1.0.0 and up, if bit 12 is set then extra vectors are present after the normals.</add>
+        <add name="Data Flags" type="NiGeometryDataFlags" ver2="4.2.2.0">The lower 6 bits of this field represent the number of UV texture sets. The rest is unused.</add>
         <add name="Has UV" type="bool" ver2="4.0.0.2">
             Do we have UV coordinates?
 
             Note: for compatibility with NifTexture, set this value to either 0x00000000 or 0xFFFFFFFF.
         </add>
-        <add name="UV Sets" type="TexCoord" arr1="((Num UV Sets #BITAND# 63) | (Vector Flags #BITAND# 63) | (BS Vector Flags #BITAND# 1))" arr2="Num Vertices">The UV texture coordinates. They follow the OpenGL standard: some programs may require you to flip the second coordinate.</add>
+        <add name="UV Sets" type="TexCoord" arr1="((Data Flags #BITAND# 63) | (BS Data Flags #BITAND# 1))" arr2="Num Vertices">The UV texture coordinates. They follow the OpenGL standard: some programs may require you to flip the second coordinate.</add>
         <add name="Consistency Flags" type="ConsistencyType" ver1="10.0.1.0" default="CT_MUTABLE">Consistency Flags</add>
         <add name="Additional Data" type="Ref" template="AbstractAdditionalGeometryData" ver1="20.0.0.4" />
     </niobject>

From 1d26f7a394c59e5133fbae8666dc904acf7b4f58 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 28 Jun 2018 17:52:48 -0400
Subject: [PATCH 57/86] bhk Collision Filter flags bitfield

---
 nif.xml | 80 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/nif.xml b/nif.xml
index 9fc060a..52bc931 100644
--- a/nif.xml
+++ b/nif.xml
@@ -716,6 +716,38 @@
         <option value="47" name="SKYL_NULL">Null</option>
     </enum>
 
+    <enum name="BipedPart" storage="byte">
+        <option value="0" name="P_OTHER">Other</option>
+        <option value="1" name="P_HEAD">Head</option>
+        <option value="2" name="P_BODY">Body</option>
+        <option value="3" name="P_SPINE1">Spine1</option>
+        <option value="4" name="P_SPINE2">Spine2</option>
+        <option value="5" name="P_L_UPPER_ARM">LUpperArm</option>
+        <option value="6" name="P_L_FOREARM">LForeArm</option>
+        <option value="7" name="P_L_HAND">LHand</option>
+        <option value="8" name="P_L_THIGH">LThigh</option>
+        <option value="9" name="P_L_CALF">LCalf</option>
+        <option value="10" name="P_L_FOOT">LFoot</option>
+        <option value="11" name="P_R_UPPER_ARM">RUpperArm</option>
+        <option value="12" name="P_R_FOREARM">RForeArm</option>
+        <option value="13" name="P_R_HAND">RHand</option>
+        <option value="14" name="P_R_THIGH">RThigh</option>
+        <option value="15" name="P_R_CALF">RCalf</option>
+        <option value="16" name="P_R_FOOT">RFoot</option>
+        <option value="17" name="P_TAIL">Tail</option>
+        <option value="18" name="P_SHIELD">Shield</option>
+        <option value="19" name="P_QUIVER">Quiver</option>
+        <option value="20" name="P_WEAPON">Weapon</option>
+        <option value="21" name="P_PONYTAIL">Ponytail</option>
+        <option value="22" name="P_WING">Wing</option>
+        <option value="23" name="P_PACK">Pack</option>
+        <option value="24" name="P_CHAIN">Chain</option>
+        <option value="25" name="P_ADDON_HEAD">AddonHead</option>
+        <option value="26" name="P_ADDON_CHEST">AddonChest</option>
+        <option value="27" name="P_ADDON_LEG">AddonLeg</option>
+        <option value="28" name="P_ADDON_ARM">AddonArm</option>
+    </enum>
+
     <enum name="MoppDataBuildType" storage="byte" versions="#SKY_AND_LATER#">
         Bethesda Havok.
         A byte describing if MOPP Data is organized into chunks (PS3) or not (PC)
@@ -1470,6 +1502,13 @@
         <member width="1" pos="12" mask="0x1000" name="Has Tangents" type="bool" />
     </bitfield>
 
+    <bitfield name="CollisionFilterFlags" storage="byte">
+        <member width="5" pos="0" mask="0x001F" name="Biped Part" type="BipedPart">Used only if the Layer is 8 (or 32/33 for Skyrim and later).</member>
+        <member width="1" pos="5" mask="0x0020" name="MOPP Scaled" type="bool" />
+        <member width="1" pos="6" mask="0x0040" name="No Collision" type="bool" />
+        <member width="1" pos="7" mask="0x0080" name="Linked Group" type="bool">If Layer is CHARCONTROLLER (CC), true means "CC Trigger Only".</member>
+    </bitfield>
+
 
     <!--Compounds
         These are like C structures and are used as sub-parts of more complex
@@ -2065,46 +2104,7 @@
         <add name="Layer" suffix="OB" type="OblivionLayer" default="OL_STATIC" ver2="20.0.0.5" vercond="#BSVER# #LT# 16">The layer the collision belongs to.</add>
         <add name="Layer" suffix="FO" type="Fallout3Layer" default="FOL_STATIC" vercond="(#VER# == 20.2.0.7) #AND# #NI_BS_LTE_FO3#">The layer the collision belongs to.</add>
         <add name="Layer" suffix="SK" type="SkyrimLayer" default="SKYL_STATIC" vercond="(#VER# == 20.2.0.7) #AND# #BS_GT_FO3#">The layer the collision belongs to.</add>
-
-        <add name="Flags and Part Number" type="byte" default="0">FLAGS are stored in highest 3 bits:
-        	Bit 7: sets the LINK property and controls whether this body is physically linked to others.
-        	Bit 6: turns collision off (not used for Layer BIPED).
-        	Bit 5: sets the SCALED property.
-
-        	PART NUMBER is stored in bits 0-4. Used only when Layer is set to BIPED.
-
-        	Part Numbers for Oblivion, Fallout 3, Skyrim:
-        	0 - OTHER
-        	1 - HEAD
-        	2 - BODY
-        	3 - SPINE1
-        	4 - SPINE2
-        	5 - LUPPERARM
-        	6 - LFOREARM
-        	7 - LHAND
-        	8 - LTHIGH
-        	9 - LCALF
-        	10 - LFOOT
-        	11 - RUPPERARM
-        	12 - RFOREARM
-        	13 - RHAND
-        	14 - RTHIGH
-        	15 - RCALF
-        	16 - RFOOT
-        	17 - TAIL
-        	18 - SHIELD
-        	19 - QUIVER
-        	20 - WEAPON
-        	21 - PONYTAIL
-        	22 - WING
-        	23 - PACK
-        	24 - CHAIN
-        	25 - ADDONHEAD
-        	26 - ADDONCHEST
-        	27 - ADDONARM
-        	28 - ADDONLEG
-        	29-31 - NULL
-        </add>
+        <add name="Flags" type="CollisionFilterFlags" default="0" />
         <add name="Group" type="ushort" />
     </compound>
 

From 12e72861eccfd6aa9c1fa6399e9f0c3bb7cdea99 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 29 Jun 2018 14:33:29 -0400
Subject: [PATCH 58/86] bhk Emulate Havok CInfo for World Obj, Entity, Rigid
 Body

Split up the Rigid Body CInfo into multiple compounds for each Havok version (though left 550/660 combined).  Followed suit with bhkWorldObject and bhkEntity.

Having each in their own CInfo simplifies both naming and versioning at the cost of repetition.

The bhkRigidBodyCInfo variants will need some kind of shared parent, but compound inheritance is currently not part of the XML spec.  It would have to be done with custom types in niflib.  The shared parent will be needed for getting/setting the same info on different CInfo versions.
---
 nif.xml | 145 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 117 insertions(+), 28 deletions(-)

diff --git a/nif.xml b/nif.xml
index 52bc931..db0bf32 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2534,15 +2534,19 @@
         Havok objects that can be saved and loaded from disk?
     </niobject>
 
+    <compound name="bhkWorldObjectCInfo">
+        <add name="Unused 01" type="byte" arr1="4" binary="true" />
+        <add name="Broad Phase Type" type="BroadPhaseType" default="BROAD_PHASE_ENTITY" />
+        <add name="Unused 02" type="byte" arr1="3" binary="true" />
+        <add name="Cinfo Property" type="hkWorldObjCinfoProperty" />
+    </compound>
+
     <niobject name="bhkWorldObject" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
         Havok objects that have a position in the world?
         <add name="Shape" type="Ref" template="bhkShape"> Link to the body for this collision object.</add>
         <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
         <add name="Havok Filter" type="HavokFilter" />
-        <add name="Unused Bytes 1" type="byte" arr1="4">Garbage data from memory.</add>
-        <add name="Broad Phase Type" type="BroadPhaseType" default="BROAD_PHASE_ENTITY" />
-        <add name="Unused Bytes 2" type="byte" arr1="3" />
-        <add name="Cinfo Property" type="hkWorldObjCinfoProperty" />
+        <add name="World Object CInfo" type="bhkWorldObjectCInfo" />
     </niobject>
 
     <niobject name="bhkPhantom" abstract="true" inherit="bhkWorldObject" versions="#BETHESDA#">
@@ -2559,25 +2563,25 @@
         <add name="Transform" type="Matrix44" />
     </niobject>
 
+    <compound name="bhkEntityCInfo">
+        <add name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT">How the body reacts to collisions. See hkResponseType for hkpWorld default implementations.</add>
+        <add name="Unused 01" type="byte" />
+        <add name="Process Contact Callback Delay" type="ushort" default="0xffff">Lowers the frequency for processContactCallbacks. A value of 5 means that a callback is raised every 5th frame. The default is once every 65535 frames.</add>
+    </compound>
+
     <niobject name="bhkEntity" abstract="true" inherit="bhkWorldObject" versions="#BETHESDA#">
         A havok node, describes physical properties.
+        <add name="Entity CInfo" type="bhkEntityCInfo" />
     </niobject>
 
-    <niobject name="bhkRigidBody" inherit="bhkEntity" versions="#BETHESDA#">
-        This is the default body type for all "normal" usable and static world objects. The "T" suffix
-        marks this body as active for translation and rotation, a normal bhkRigidBody ignores those
-        properties. Because the properties are equal, a bhkRigidBody may be renamed into a bhkRigidBodyT and vice-versa.
-        <add name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT">How the body reacts to collisions. See hkResponseType for hkpWorld default implementations.</add>
-        <add name="Unused Byte 1" type="byte">Skipped over when writing Collision Response and Callback Delay.</add>
-        <add name="Process Contact Callback Delay" type="ushort" default="0xffff">Lowers the frequency for processContactCallbacks. A value of 5 means that a callback is raised every 5th frame. The default is once every 65535 frames.</add>
-        <add name="Unknown Int 1" type="uint" ver1="10.1.0.0" />
-        <add name="Havok Filter Copy" type="HavokFilter" ver1="10.1.0.0">Copy of Havok Filter</add>
-        <add name="Unused 2" type="byte" arr1="4" ver1="10.1.0.0">Garbage data from memory. Matches previous Unused value.</add>
-        <add name="Unknown Int 2" type="uint" ver1="10.1.0.0" vercond="#BS_GT_FO3#" />
-        <add name="Collision Response 2" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT" ver1="10.1.0.0" />
-        <add name="Unused Byte 2" type="byte" ver1="10.1.0.0">Skipped over when writing Collision Response and Callback Delay.</add>
-        <add name="Process Contact Callback Delay 2" type="ushort" default="0xffff" ver1="10.1.0.0" />
-        <add name="Unknown Int 2" type="uint" vercond="#NI_BS_LTE_FO3#" />
+    <compound name="bhkRigidBodyCInfo550_660">
+        <add name="Unused 01" type="byte" arr1="4" binary="true" ver1="10.1.0.0" />
+        <add name="Havok Filter" type="HavokFilter" ver1="10.1.0.0" />
+        <add name="Unused 02" type="byte" arr1="4" binary="true" ver1="10.1.0.0" />
+        <add name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT" ver1="10.1.0.0" />
+        <add name="Unused 03" type="byte" ver1="10.1.0.0" />
+        <add name="Process Contact Callback Delay" type="ushort" default="0xffff" ver1="10.1.0.0" />
+        <add name="Unused 04" type="byte" arr1="4" binary="true" />
         <add name="Translation" type="Vector4"> A vector that moves the body by the specified amount. Only enabled in bhkRigidBodyT objects.</add>
         <add name="Rotation" type="hkQuaternion">The rotation Yaw/Pitch/Roll to apply to the body. Only enabled in bhkRigidBodyT objects.</add>
         <add name="Linear Velocity" type="Vector4">Linear velocity.</add>
@@ -2587,34 +2591,119 @@
         <add name="Mass" type="float" default="1.0">The body's mass in kg. A mass of zero represents an immovable object.</add>
         <add name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</add>
         <add name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</add>
-        <add name="Time Factor" type="float" default="1.0" vercond="#BS_GT_FO3#" />
-        <add name="Gravity Factor" type="float" default="1.0" vercond="#BS_GT_FO3# #AND# (!#BS_FO4#)" />
         <add name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</add>
-        <add name="Rolling Friction Multiplier" type="float" vercond="#BS_GT_FO3#" />
         <add name="Restitution" type="float" default="0.4">
             How "bouncy" the body is, i.e. how much energy it has after colliding. Less than 1.0 loses energy, greater than 1.0 gains energy.
             If the restitution is not 0.0 the object will need extra CPU for all new collisions.
         </add>
         <add name="Max Linear Velocity" type="float" default="104.4" ver1="10.1.0.0">Maximal linear velocity.</add>
         <add name="Max Angular Velocity" type="float" default="31.57" ver1="10.1.0.0">Maximal angular velocity.</add>
-        <add name="Penetration Depth" type="float" default="0.15" ver1="10.1.0.0" vercond="!#BS_FO4#">
+        <add name="Penetration Depth" type="float" default="0.15" ver1="10.1.0.0">
             The maximum allowed penetration for this object.
             This is a hint to the engine to see how much CPU the engine should invest to keep this object from penetrating.
             A good choice is 5% - 20% of the smallest diameter of the object.
         </add>
         <add name="Motion System" type="hkMotionType" default="MO_SYS_DYNAMIC">Motion system? Overrides Quality when on Keyframed?</add>
-        <add name="Deactivator Type" type="hkDeactivatorType" default="DEACTIVATOR_NEVER" vercond="#NI_BS_LTE_FO3#">The initial deactivator type of the body.</add>
-        <add name="Enable Deactivation" type="bool" default="1" vercond="#BS_GT_FO3#" />
+        <add name="Deactivator Type" type="hkDeactivatorType" default="DEACTIVATOR_NEVER">The initial deactivator type of the body.</add>
         <add name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</add>
         <add name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED">The type of interaction with other objects.</add>
-        <add name="Penetration Depth" type="float" default="0.15" vercond="#BS_FO4#">
+        <add name="Unknown Bytes 1" type="byte" arr1="12" />
+    </compound>
+
+    <compound name="bhkRigidBodyCInfo2010">
+        <add name="Unused 01" type="byte" arr1="4" binary="true" />
+        <add name="Havok Filter" type="HavokFilter" />
+        <add name="Unused 02" type="byte" arr1="4" binary="true" />
+        <add name="Unknown Int 1" type="uint" />
+        <add name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT" />
+        <add name="Unused 03" type="byte" />
+        <add name="Process Contact Callback Delay" type="ushort" default="0xffff" />
+        <add name="Translation" type="Vector4"> A vector that moves the body by the specified amount. Only enabled in bhkRigidBodyT objects.</add>
+        <add name="Rotation" type="hkQuaternion">The rotation Yaw/Pitch/Roll to apply to the body. Only enabled in bhkRigidBodyT objects.</add>
+        <add name="Linear Velocity" type="Vector4">Linear velocity.</add>
+        <add name="Angular Velocity" type="Vector4">Angular velocity.</add>
+        <add name="Inertia Tensor" type="hkMatrix3">Defines how the mass is distributed among the body, i.e. how difficult it is to rotate around any given axis.</add>
+        <add name="Center" type="Vector4">The body's center of mass.</add>
+        <add name="Mass" type="float" default="1.0">The body's mass in kg. A mass of zero represents an immovable object.</add>
+        <add name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</add>
+        <add name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</add>
+        <add name="Time Factor" type="float" default="1.0" />
+        <add name="Gravity Factor" type="float" default="1.0" />
+        <add name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</add>
+        <add name="Rolling Friction Multiplier" type="float" />
+        <add name="Restitution" type="float" default="0.4">
+            How "bouncy" the body is, i.e. how much energy it has after colliding. Less than 1.0 loses energy, greater than 1.0 gains energy.
+            If the restitution is not 0.0 the object will need extra CPU for all new collisions.
+        </add>
+        <add name="Max Linear Velocity" type="float" default="104.4">Maximal linear velocity.</add>
+        <add name="Max Angular Velocity" type="float" default="31.57">Maximal angular velocity.</add>
+        <add name="Penetration Depth" type="float" default="0.15">
             The maximum allowed penetration for this object.
             This is a hint to the engine to see how much CPU the engine should invest to keep this object from penetrating.
             A good choice is 5% - 20% of the smallest diameter of the object.
         </add>
-        <add name="Unknown Float 1" type="float" vercond="#BS_FO4#" />
+        <add name="Motion System" type="hkMotionType" default="MO_SYS_DYNAMIC">Motion system? Overrides Quality when on Keyframed?</add>
+        <add name="Enable Deactivation" type="bool" default="1" />
+        <add name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</add>
+        <add name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED">The type of interaction with other objects.</add>
+        <add name="Auto Remove Level" type="byte" />
+        <add name="Response Modifier Flags" type="byte" />
+        <add name="Num Shape Keys in Contact Point" type="byte" default="3" />
+        <add name="Force Collided Onto PPU" type="bool" />
         <add name="Unknown Bytes 1" type="byte" arr1="12" />
-        <add name="Unknown Bytes 2" type="byte" arr1="4" vercond="#BS_GT_FO3#" />
+    </compound>
+
+    <compound name="bhkRigidBodyCInfo2014">
+        <add name="Unused 01" type="byte" arr1="4" binary="true" />
+        <add name="Havok Filter" type="HavokFilter" />
+        <add name="Unused 02" type="byte" arr1="12" binary="true" />
+        <add name="Translation" type="Vector4"> A vector that moves the body by the specified amount. Only enabled in bhkRigidBodyT objects.</add>
+        <add name="Rotation" type="hkQuaternion">The rotation Yaw/Pitch/Roll to apply to the body. Only enabled in bhkRigidBodyT objects.</add>
+        <add name="Linear Velocity" type="Vector4">Linear velocity.</add>
+        <add name="Angular Velocity" type="Vector4">Angular velocity.</add>
+        <add name="Inertia Tensor" type="hkMatrix3">Defines how the mass is distributed among the body, i.e. how difficult it is to rotate around any given axis.</add>
+        <add name="Center" type="Vector4">The body's center of mass.</add>
+        <add name="Mass" type="float" default="1.0">The body's mass in kg. A mass of zero represents an immovable object.</add>
+        <add name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</add>
+        <add name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</add>
+        <add name="Gravity Factor" type="float" default="1.0"/>
+        <add name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</add>
+        <add name="Rolling Friction Multiplier" type="float" />
+        <add name="Restitution" type="float" default="0.4">
+            How "bouncy" the body is, i.e. how much energy it has after colliding. Less than 1.0 loses energy, greater than 1.0 gains energy.
+            If the restitution is not 0.0 the object will need extra CPU for all new collisions.
+        </add>
+        <add name="Max Linear Velocity" type="float" default="104.4">Maximal linear velocity.</add>
+        <add name="Max Angular Velocity" type="float" default="31.57">Maximal angular velocity.</add>
+        <add name="Motion System" type="hkMotionType" default="MO_SYS_DYNAMIC">Motion system? Overrides Quality when on Keyframed?</add>
+        <add name="Enable Deactivation" type="bool" default="1" />
+        <add name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</add>
+        <add name="Unused 03" type="byte" />
+        <add name="Penetration Depth" type="float" default="0.15">
+            The maximum allowed penetration for this object.
+            This is a hint to the engine to see how much CPU the engine should invest to keep this object from penetrating.
+            A good choice is 5% - 20% of the smallest diameter of the object.
+        </add>
+        <add name="Time Factor" type="float" />
+        <add name="Unused 04" type="byte" arr1="4" />
+        <add name="Collision Response" type="hkResponseType" />
+        <add name="Unused 05" type="byte" />
+        <add name="Process Contact Callback Delay 3" type="ushort" default="0xffff" />
+        <add name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED" />
+        <add name="Auto Remove Level" type="byte" />
+        <add name="Response Modifier Flags" type="byte" />
+        <add name="Num Shape Keys in Contact Point" type="byte" default="3" />
+        <add name="Force Collided Onto PPU" type="bool" />
+        <add name="Unused 06" type="byte" arr1="3" />
+    </compound>
+
+    <niobject name="bhkRigidBody" inherit="bhkEntity" versions="#BETHESDA#">
+        This is the default body type for all "normal" usable and static world objects. The "T" suffix
+        marks this body as active for translation and rotation, a normal bhkRigidBody ignores those
+        properties. Because the properties are equal, a bhkRigidBody may be renamed into a bhkRigidBodyT and vice-versa.
+        <add name="Rigid Body CInfo" suffix="550_660" type="bhkRigidBodyCInfo550_660" vercond="#NI_BS_LTE_FO3#" />
+        <add name="Rigid Body CInfo" suffix="2010" type="bhkRigidBodyCInfo2010" vercond="#BS_GTE_SKY# #AND# (!#BS_FO4#)" />
+        <add name="Rigid Body CInfo" suffix="2014" type="bhkRigidBodyCInfo2014" vercond="#BS_FO4#" />
         <add name="Num Constraints" type="uint" />
         <add name="Constraints" type="Ref" template="bhkSerializable" arr1="Num Constraints" />
         <add name="Body Flags" type="uint" vercond="#BSVER# #LT# 76">1 = respond to wind</add>

From 8d8a4aedfe96eaace2fc6aa7df67950ab4728b7b Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 29 Jun 2018 14:37:55 -0400
Subject: [PATCH 59/86] NiBound naming consistency

For Name-based APIs, naming all NiBound fields consistently helps with generic treatment of NiBound getting and setting for any NiObject.
---
 nif.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nif.xml b/nif.xml
index db0bf32..6837bb5 100644
--- a/nif.xml
+++ b/nif.xml
@@ -3506,7 +3506,7 @@
             Most new blocks (e.g. BSTriShape) do not refer to NiGeometry except NiParticleSystem was changed to use BSGeometry.
             This causes massive inheritance problems so the rows below are doubled up to exclude NiParticleSystem for Bethesda Stream 100+
             and to add data exclusive to BSGeometry.
-        <add name="Bound" type="NiBound" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
+        <add name="Bounding Sphere" type="NiBound" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
         <add name="Skin" type="Ref" template="NiObject" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
         <add name="Data" type="Ref" template="NiGeometryData" vercond="#NI_BS_LT_SSE#">Data index (NiTriShapeData/NiTriStripData).</add>
         <add name="Data" type="Ref" template="NiGeometryData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</add>
@@ -4689,8 +4689,8 @@
 
     <niobject name="NiScreenLODData" inherit="NiLODData">
         NiScreenLODData controls switching LOD levels based on proportion of the screen that a bound would include.
-        <add name="Bound" type="NiBound" />
-        <add name="World Bound" type="NiBound" />
+        <add name="Bounding Sphere" type="NiBound" />
+        <add name="World Bounding Sphere" type="NiBound" />
         <add name="Num Proportions" type="uint" />
         <add name="Proportion Levels" type="float" arr1="Num Proportions" />
     </niobject>
@@ -6773,7 +6773,7 @@
         <add name="EM Data" type="MeshDataEpicMickey" ver1="20.6.5.0" ver2="20.6.5.0" />
         <add name="Num Submeshes" type="ushort">The number of submeshes contained in this mesh.</add>
         <add name="Instancing Enabled" type="bool">Sets whether hardware instancing is being used.</add>
-        <add name="Bound" type="NiBound">The combined bounding volume of all submeshes.</add>
+        <add name="Bounding Sphere" type="NiBound">The combined bounding volume of all submeshes.</add>
         <add name="Num Datastreams" type="uint" />
         <add name="Datastreams" type="DataStreamRef" arr1="Num Datastreams" />
         <add name="Num Modifiers" type="uint" />
@@ -6837,7 +6837,7 @@
         <add name="Per Instance Culling" type="bool" />
         <add name="Has Static Bounds" type="bool" />
         <add name="Affected Mesh" type="Ref" template="NiMesh" />
-        <add name="Bound" type="NiBound" cond="Has Static Bounds" />
+        <add name="Bounding Sphere" type="NiBound" cond="Has Static Bounds" />
         <add name="Num Instance Nodes" type="uint" cond="Has Instance Nodes" />
         <add name="Instance Nodes" type="Ref" template="NiMeshHWInstance" arr1="Num Instance Nodes" cond="Has Instance Nodes" />
     </niobject>

From 20dab6b589fad41fa0057d7816b103382009bdd5 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 29 Jun 2018 14:40:38 -0400
Subject: [PATCH 60/86] FO4 skin instance and shader decoding

FO4 changed the Color3 to a Color4 for Skin Tint.  Leaving as separate Alpha for now however.

Also found out the point of the BSSkin::Instance array which is non-uniform scaling.
---
 nif.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nif.xml b/nif.xml
index 6837bb5..0153898 100644
--- a/nif.xml
+++ b/nif.xml
@@ -6120,7 +6120,7 @@
         <add name="Use Screen Space Reflections" type="bool" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
         <add name="Wetness Control: Use SSR" type="bool" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
         <add name="Skin Tint Color" type="Color3" cond="Skyrim Shader Type == 5">Tints the base texture. Overridden by game settings.</add>
-        <add name="Unknown Skin Tint Int" type="uint" cond="Skyrim Shader Type == 5" vercond="#BS_FO4#" />
+        <add name="Skin Tint Alpha" type="float" default="1.0" cond="Skyrim Shader Type == 5" vercond="#BS_FO4#" />
         <add name="Hair Tint Color" type="Color3" cond="Skyrim Shader Type == 6">Tints the base texture. Overridden by game settings.</add>
         <add name="Max Passes" type="float" cond="Skyrim Shader Type == 7">Max Passes</add>
         <add name="Scale" type="float" cond="Skyrim Shader Type == 7">Scale</add>
@@ -7765,8 +7765,8 @@
         <add name="Data" type="Ref" template="BSSkin::BoneData" />
         <add name="Num Bones" type="uint" />
         <add name="Bones" type="Ptr" template="NiNode" arr1="Num Bones" />
-        <add name="Num Unknown" type="uint" />
-        <add name="Unknown" type="Vector3" arr1="Num Unknown" />
+        <add name="Num Scales" type="uint" />
+        <add name="Scales" type="Vector3" arr1="Num Scales" />
     </niobject>
 
     <niobject name="BSSkin::BoneData" inherit="NiObject" versions="#FO4#">

From 7887f4ea3b08d07db357c018a792bf329054de44 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 29 Jun 2018 14:45:39 -0400
Subject: [PATCH 61/86] Default Values Pass 1

Added `default` to a large number of members, as well as `calc` to a few members to enforce array sizes based on other data.

Also fixed a few `type` issues.

This is a first pass in a much larger effort,  using data analysis to gather the most commonly used values.
---
 nif.xml | 235 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 127 insertions(+), 108 deletions(-)

diff --git a/nif.xml b/nif.xml
index 0153898..afd52c0 100644
--- a/nif.xml
+++ b/nif.xml
@@ -124,6 +124,11 @@
         Commonly used default values.
         <default token="#UINT_MAX#" string="0xFFFFFFFF" />
         <default token="#USHRT_MAX#" string="0xFFFF" />
+        <default token="#BYTE_MAX#" string="0xFF" />
+        <default token="#INT_MAX#" string="2147483647" />
+        <default token="#INT_MIN#" string="-2147483648" />
+        <default token="#CHAR_MAX#" string="127" />
+        <default token="#CHAR_MIN#" string="-128" />
         <default token="#VEC2_ONE#" string="1.0, 1.0" />
         <default token="#VEC3_ONE#" string="1.0, 1.0, 1.0" />
         <default token="#VEC3_ZERO#" string="0.0, 0.0, 0.0" />
@@ -2399,7 +2404,7 @@
         Defines subshape chunks in bhkCompressedMeshShapeData
         <add name="Translation" type="Vector4" />
         <add name="Material Index" type="uint">Index of material in bhkCompressedMeshShapeData::Chunk Materials</add>
-        <add name="Reference" type="ushort">Always 65535?</add>
+        <add name="Reference" type="ushort" default="#USHRT_MAX#">Index of another chunk in the chunks list.</add>
         <add name="Transform Index" type="ushort">Index of transformation in bhkCompressedMeshShapeData::Chunk Transforms</add>
         <add name="Num Vertices" type="uint" />
         <add name="Vertices" type="ushort" arr1="Num Vertices" />
@@ -2775,7 +2780,7 @@
         <add name="Num Entities" type="uint" default="2">Hardcoded to 2. Don't change.</add>
         <add name="Entity A" type="Ptr" template="bhkRigidBody" />
         <add name="Entity B" type="Ptr" template="bhkRigidBody" />
-        <add name="Priority" type="uint" />
+        <add name="Priority" type="uint" default="1" />
     </niobject>
 
     <niobject name="bhkShape" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
@@ -2918,7 +2923,7 @@
 
         Also, shapes collected in a bhkListShape may not have the correct
         walking noise, so only use it for non-walkable objects.
-        <add name="Num Sub Shapes" type="uint" calc="(#LEN[Sub Shapes]# #LT# 256) #THEN# #LEN[Sub Shapes]# #ELSE# 256" />
+        <add name="Num Sub Shapes" type="uint" default="1" calc="(#LEN[Sub Shapes]# #LT# 256) #THEN# #LEN[Sub Shapes]# #ELSE# 256" />
         <add name="Sub Shapes" type="Ref" template="bhkShape" arr1="Num Sub Shapes">List of shapes. Max of 256.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Child Shape Property" type="hkWorldObjCinfoProperty" />
@@ -2963,9 +2968,9 @@
         <add name="Unused" type="uint" arr1="5">Garbage data from memory though the last 3 are referred to as maxSize, size, and eSize.</add>
         <add name="Grow By" type="uint" default="1" />
         <add name="Scale" type="Vector4" default="#VEC4_1110#" ver1="10.1.0.0">Scale. Usually (1.0, 1.0, 1.0, 0.0).</add>
-        <add name="Num Strips Data" type="uint">The number of strips data objects referenced.</add>
+        <add name="Num Strips Data" type="uint" default="1">The number of strips data objects referenced.</add>
         <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data">Refers to a bunch of NiTriStripsData objects that make up this shape.</add>
-        <add name="Num Data Layers" type="uint">Number of Havok Layers, equal to Number of strips data objects.</add>
+        <add name="Num Data Layers" type="uint" default="1" calc="#LEN[Strips Data]#" />
         <add name="Data Layers" type="HavokFilter" arr1="Num Data Layers">Havok Layers for each strip data.</add>
     </niobject>
 
@@ -3064,9 +3069,9 @@
         <add name="Weight Threshold" type="float" ver1="10.1.0.112" />
         <!-- Flags conds -->
         <add name="Interp Count" type="byte" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="Single Index" type="byte" default="255" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="High Priority" type="char" default="-128" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="Next High Priority" type="char" default="-128" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="Single Index" type="byte" default="#BYTE_MAX#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="High Priority" type="char" default="#CHAR_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <add name="Next High Priority" type="char" default="#CHAR_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
         <add name="Single Time" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
         <add name="High Weights Sum" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
         <add name="Next High Weights Sum" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
@@ -3074,19 +3079,19 @@
         <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
         <!-- /Flags conds -->
         <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" ver2="10.1.0.111" />
-        <add name="Managed Controlled" type="bool" ver2="10.1.0.111" />
+        <add name="Manager Controlled" type="bool" ver2="10.1.0.111" />
         <add name="Weight Threshold" type="float" ver2="10.1.0.111" />
         <add name="Only Use Highest Weight" type="bool" ver2="10.1.0.111" />
         <add name="Interp Count" type="ushort" ver2="10.1.0.109" />
-        <add name="Single Index" type="ushort" ver2="10.1.0.109" />
+        <add name="Single Index" type="ushort" default="#USHRT_MAX#" ver2="10.1.0.109" />
         <add name="Interp Count" type="byte" ver1="10.1.0.110" ver2="10.1.0.111" />
-        <add name="Single Index" type="byte" ver1="10.1.0.110" ver2="10.1.0.111" />
+        <add name="Single Index" type="byte" default="#BYTE_MAX#" ver1="10.1.0.110" ver2="10.1.0.111" />
         <add name="Single Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.108" ver2="10.1.0.111" />
-        <add name="Single Time" type="float" ver1="10.1.0.108" ver2="10.1.0.111" />
-        <add name="High Priority" type="int" ver2="10.1.0.109" />
-        <add name="Next High Priority" type="int" ver2="10.1.0.109" />
-        <add name="High Priority" type="byte" ver1="10.1.0.110" ver2="10.1.0.111" />
-        <add name="Next High Priority" type="byte" ver1="10.1.0.110" ver2="10.1.0.111" />
+        <add name="Single Time" type="float" default="#FLT_MIN#" ver1="10.1.0.108" ver2="10.1.0.111" />
+        <add name="High Priority" type="int" default="#INT_MIN#" ver2="10.1.0.109" />
+        <add name="Next High Priority" type="int" default="#INT_MIN#" ver2="10.1.0.109" />
+        <add name="High Priority" type="char" default="#CHAR_MIN#" ver1="10.1.0.110" ver2="10.1.0.111" />
+        <add name="Next High Priority" type="char" default="#CHAR_MIN#" ver1="10.1.0.110" ver2="10.1.0.111" />
     </niobject>
 
     <niobject name="NiBSplineInterpolator" abstract="true" inherit="NiInterpolator">
@@ -3160,8 +3165,8 @@
 
     <niobject name="bhkBlendCollisionObject" inherit="bhkCollisionObject">
         Unknown.
-        <add name="Heir Gain" type="float" />
-        <add name="Vel Gain" type="float" />
+        <add name="Heir Gain" type="float" default="1.0" />
+        <add name="Vel Gain" type="float" default="1.0" />
         <add name="Unknown Float 1" type="float" vercond="#BSVER# #LT# 9" />
         <add name="Unknown Float 2" type="float" vercond="#BSVER# #LT# 9" />
     </niobject>
@@ -3601,7 +3606,7 @@
 
     <niobject name="BSWindModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
         Particle Modifier that uses the wind value from the gamedata to alter the path of particles.
-        <add name="Strength" type="float">The amount of force wind will have on particles.</add>
+        <add name="Strength" type="float" default="0.25">The amount of force wind will have on particles.</add>
     </niobject>
 
     <niobject name="hkPackedNiTriStripsData" inherit="bhkShapeCollection">
@@ -3809,21 +3814,21 @@
     <niobject name="NiCamera" inherit="NiAVObject">
         Camera object.
         <add name="Camera Flags" type="ushort" ver1="10.1.0.0">Obsolete flags.</add>
-        <add name="Frustum Left" type="float">Frustrum left.</add>
-        <add name="Frustum Right" type="float">Frustrum right.</add>
-        <add name="Frustum Top" type="float">Frustrum top.</add>
-        <add name="Frustum Bottom" type="float">Frustrum bottom.</add>
-        <add name="Frustum Near" type="float">Frustrum near.</add>
-        <add name="Frustum Far" type="float">Frustrum far.</add>
+        <add name="Frustum Left" type="float" default="-0.63707">Frustrum left.</add>
+        <add name="Frustum Right" type="float" default="0.63707">Frustrum right.</add>
+        <add name="Frustum Top" type="float" default="0.385714">Frustrum top.</add>
+        <add name="Frustum Bottom" type="float" default="-0.385714">Frustrum bottom.</add>
+        <add name="Frustum Near" type="float" default="1.0">Frustrum near.</add>
+        <add name="Frustum Far" type="float" default="5000.0">Frustrum far.</add>
         <add name="Use Orthographic Projection" type="bool" ver1="10.1.0.0">Determines whether perspective is used.  Orthographic means no perspective.</add>
         <add name="Viewport Left" type="float">Viewport left.</add>
-        <add name="Viewport Right" type="float">Viewport right.</add>
-        <add name="Viewport Top" type="float">Viewport top.</add>
+        <add name="Viewport Right" type="float" default="1.0">Viewport right.</add>
+        <add name="Viewport Top" type="float" default="1.0">Viewport top.</add>
         <add name="Viewport Bottom" type="float">Viewport bottom.</add>
-        <add name="LOD Adjust" type="float">Level of detail adjust.</add>
+        <add name="LOD Adjust" type="float" default="1.0">Level of detail adjust.</add>
         <add name="Scene" type="Ref" template="NiAVObject" />
-        <add name="Num Screen Polygons" type="uint" default="0">Deprecated. Array is always zero length on disk write.</add>
-        <add name="Num Screen Textures" type="uint" default="0" ver1="4.2.1.0">Deprecated. Array is always zero length on disk write.</add>
+        <add name="Num Screen Polygons" type="uint" calc="0">Deprecated. Array is always zero length on disk write.</add>
+        <add name="Num Screen Textures" type="uint" calc="0" ver1="4.2.1.0">Deprecated. Array is always zero length on disk write.</add>
         <add name="Unknown Int 3" type="uint" ver2="3.1" />
     </niobject>
 
@@ -3862,7 +3867,7 @@
         Root node in Gamebryo .kf files (version 10.0.1.0 and up).
         <add name="Weight" type="float" default="1.0" ver1="10.1.0.106">The weight of a sequence describes how it blends with other sequences at the same priority.</add>
         <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver1="10.1.0.106" />
-        <add name="Cycle Type" type="CycleType" ver1="10.1.0.106" />
+        <add name="Cycle Type" type="CycleType" default="CYCLE_CLAMP" ver1="10.1.0.106" />
         <add name="Frequency" type="float" default="1.0" ver1="10.1.0.106" />
         <!-- Actually 10.3.0.1 but WorldShift 10.4.0.1 custom version acts like 10.3.0.1 -->
         <add name="Phase" type="float" ver1="10.1.0.106" ver2="10.4.0.1" />
@@ -3871,7 +3876,7 @@
         <add name="Play Backwards" type="bool" ver1="10.1.0.106" ver2="10.1.0.106" />
         <add name="Manager" type="Ptr" template="NiControllerManager" ver1="10.1.0.106">The owner of this sequence.</add>
         <add name="Accum Root Name" type="string" ver1="10.1.0.106">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
-        <add name="Accum Flags" type="AccumFlags" ver1="20.3.0.8" default="ACCUM_X_FRONT" />
+        <add name="Accum Flags" type="AccumFlags" default="ACCUM_X_FRONT" ver1="20.3.0.8" />
         <add name="String Palette" type="Ref" template="NiStringPalette" ver1="10.1.0.113" ver2="20.1.0.0" />
         <add name="Anim Notes" type="Ref" template="BSAnimNotes" ver1="20.2.0.7" vercond="(#BSVER# #GTE# 24) #AND# (#BSVER# #LTE# 28)" />
         <add name="Num Anim Note Arrays" type="ushort" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
@@ -4463,8 +4468,8 @@
     
     <niobject name="BSPSysInheritVelocityModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
         <add name="Inherit Object" type="Ptr" template="NiAVObject" />
-        <add name="Chance To Inherit" type="float" />
-        <add name="Velocity Multiplier" type="float" />
+        <add name="Chance To Inherit" type="float" default="100.0" />
+        <add name="Velocity Multiplier" type="float" default="0.5" />
         <add name="Velocity Variation" type="float" />
     </niobject>
     
@@ -4480,12 +4485,12 @@
     
     <niobject name="BSPSysSubTexModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
         Similar to a Flip Controller, this handles particle texture animation on a single texture atlas
-        <add name="Start Frame" type="uint">Starting frame/position on atlas</add>
-        <add name="Start Frame Fudge" type="float">Random chance to start on a different frame?</add>
-        <add name="End Frame" type="float">Ending frame/position on atlas</add>
+        <add name="Start Frame" type="float">Starting frame/position on atlas</add>
+        <add name="Start Frame Fudge" type="float" default="64.0">Random chance to start on a different frame?</add>
+        <add name="End Frame" type="float" default="63.0">Ending frame/position on atlas</add>
         <add name="Loop Start Frame" type="float">Frame to start looping</add>
         <add name="Loop Start Frame Fudge" type="float" />
-        <add name="Frame Count" type="float" />
+        <add name="Frame Count" type="float" default="30.0" />
         <add name="Frame Count Fudge" type="float" />
     </niobject>
     
@@ -5862,17 +5867,17 @@
         <add name="Interpolator 7: Length Var" type="Ref" template="NiInterpolator">References length variation interpolator.</add>
         <add name="Interpolator 8: Width" type="Ref" template="NiInterpolator">References width interpolator.</add>
         <add name="Interpolator 9: Arc Offset" type="Ref" template="NiInterpolator">References interpolator for amplitude control. 0=straight, 50=wide</add>
-        <add name="Subdivisions" type="ushort" />
-        <add name="Num Branches" type="ushort" />
-        <add name="Num Branches Variation" type="ushort" />
-        <add name="Length" type="float">How far lightning will stretch to.</add>
-        <add name="Length Variation" type="float">How far lightning variation will stretch to.</add>
-        <add name="Width" type="float">How wide the bolt will be.</add>
-        <add name="Child Width Mult" type="float">Influences forking behavior with a multiplier.</add>
-        <add name="Arc Offset" type="float" />
-        <add name="Fade Main Bolt" type="bool" />
-        <add name="Fade Child Bolts" type="bool" />
-        <add name="Animate Arc Offset" type="bool" />
+        <add name="Subdivisions" type="ushort" default="6" />
+        <add name="Num Branches" type="ushort" default="1" />
+        <add name="Num Branches Variation" type="ushort" default="1" />
+        <add name="Length" type="float" default="512.0">How far lightning will stretch to.</add>
+        <add name="Length Variation" type="float" default="30.0">How far lightning variation will stretch to.</add>
+        <add name="Width" type="float" default="16.0">How wide the bolt will be.</add>
+        <add name="Child Width Mult" type="float" default="0.75">Influences forking behavior with a multiplier.</add>
+        <add name="Arc Offset" type="float" default="20.0" />
+        <add name="Fade Main Bolt" type="bool" default="1" />
+        <add name="Fade Child Bolts" type="bool" default="1" />
+        <add name="Animate Arc Offset" type="bool" default="1" />
         <add name="Shader Property" type="Ref" template="BSShaderProperty">Reference to a shader property.</add>
 	</niobject>
 
@@ -6094,7 +6099,7 @@
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set, can have override in an esm/esp</add>
         <add name="Emissive Color" type="Color3" default="#VEC3_ZERO#">Glow color and alpha</add>
-        <add name="Emissive Multiple" type="float">Multiplied emissive colors</add>
+        <add name="Emissive Multiple" type="float" default="1.0">Multiplied emissive colors</add>
         <add name="Wet Material" type="string" vercond="#BS_FO4#" />
         <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T">How to handle texture borders.</add>
         <add name="Alpha" type="float" default="1.0">The material opacity (1=non-transparent).</add>
@@ -6105,10 +6110,10 @@
         <add name="Specular Strength" type="float" default="1.0">Brightness of specular highlight. (0=not visible) (0-999)</add>
         <add name="Lighting Effect 1" type="float" default="0.3" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
         <add name="Lighting Effect 2" type="float" default="2.0" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
-        <add name="Subsurface Rolloff" type="float" default="0.3" vercond="#BS_FO4#" />
+        <add name="Subsurface Rolloff" type="float" default="0.0" vercond="#BS_FO4#" />
         <add name="Rimlight Power" type="float" default="#FLT_MAX#" vercond="#BS_FO4#" />
         <add name="Backlight Power" type="float" cond="Rimlight Power == 0x7F7FFFFF" vercond="#BS_FO4#" />
-        <add name="Grayscale to Palette Scale" type="float" vercond="#BS_FO4#" />
+        <add name="Grayscale to Palette Scale" type="float" default="1.0" vercond="#BS_FO4#" />
         <add name="Fresnel Power" type="float" default="5.0" vercond="#BS_FO4#" />
         <add name="Wetness Spec Scale" type="float" default="-1.0" vercond="#BS_FO4#" />
         <add name="Wetness Spec Power" type="float" default="-1.0" vercond="#BS_FO4#" />
@@ -6124,12 +6129,12 @@
         <add name="Hair Tint Color" type="Color3" cond="Skyrim Shader Type == 6">Tints the base texture. Overridden by game settings.</add>
         <add name="Max Passes" type="float" cond="Skyrim Shader Type == 7">Max Passes</add>
         <add name="Scale" type="float" cond="Skyrim Shader Type == 7">Scale</add>
-        <add name="Parallax Inner Layer Thickness" type="float" cond="Skyrim Shader Type == 11">How far from the surface the inner layer appears to be.</add>
-        <add name="Parallax Refraction Scale" type="float" cond="Skyrim Shader Type == 11">Depth of inner parallax layer effect.</add>
+        <add name="Parallax Inner Layer Thickness" type="float" default="5.0" cond="Skyrim Shader Type == 11">How far from the surface the inner layer appears to be.</add>
+        <add name="Parallax Refraction Scale" type="float" default="0.25" cond="Skyrim Shader Type == 11">Depth of inner parallax layer effect.</add>
         <add name="Parallax Inner Layer Texture Scale" type="TexCoord" cond="Skyrim Shader Type == 11">Scales the inner parallax layer texture.</add>
-        <add name="Parallax Envmap Strength" type="float" cond="Skyrim Shader Type == 11">How strong the environment/cube map is. (0-??)</add>
+        <add name="Parallax Envmap Strength" type="float" default="1.0" cond="Skyrim Shader Type == 11">How strong the environment/cube map is. (0-??)</add>
         <add name="Sparkle Parameters" type="Vector4" cond="Skyrim Shader Type == 14">CK lists "snow material" when used.</add>
-        <add name="Eye Cubemap Scale" type="float" cond="Skyrim Shader Type == 16">Eye cubemap scale</add>
+        <add name="Eye Cubemap Scale" type="float" default="1.3" cond="Skyrim Shader Type == 16">Eye cubemap scale</add>
         <add name="Left Eye Reflection Center" type="Vector3" cond="Skyrim Shader Type == 16">Offset to set center for left eye cubemap</add>
         <add name="Right Eye Reflection Center" type="Vector3" cond="Skyrim Shader Type == 16">Offset to set center for right eye cubemap</add>
     </niobject>
@@ -6153,7 +6158,7 @@
         <add name="Falloff Start Opacity" type="float">Alpha falloff multiplier at start angle</add>
         <add name="Falloff Stop Opacity" type="float">Alpha falloff multiplier at end angle</add>
         <add name="Emissive Color" type="Color4">Emissive color</add>
-        <add name="Emissive Multiple" type="float">Multiplier for Emissive Color (RGB part)</add>
+        <add name="Emissive Multiple" type="float" default="1.0">Multiplier for Emissive Color (RGB part)</add>
         <add name="Soft Falloff Depth" type="float"></add>
         <add name="Greyscale Texture"  type="SizedString">Points to an external texture, used as palette for SLSF1_Greyscale_To_PaletteColor/SLSF1_Greyscale_To_PaletteAlpha.</add>
         <add name="Env Map Texture" type="SizedString" vercond="#BS_FO4#" />
@@ -6176,23 +6181,23 @@
     
     <niobject name="BSWaterShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Skyrim water shader property, different from "WaterShaderProperty" seen in Fallout.
-        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1"></add>
-        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2"></add>
+        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="2147483656" />
+        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="33" />
         <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
-        <add name="Water Shader Flags" type="SkyrimWaterShaderFlags">Defines attributes for the water shader (will use SkyrimWaterShaderFlags)</add>
-        <add name="Water Direction" type="byte" default="3">A bitflag, only the first/second bit controls water flow positive or negative along UVs.</add>
+        <add name="Water Shader Flags" type="SkyrimWaterShaderFlags" default="196">Defines attributes for the water shader (will use SkyrimWaterShaderFlags)</add>
+        <add name="Water Direction" type="byte" default="0">A bitflag, only the first/second bit controls water flow positive or negative along UVs.</add>
         <add name="Unknown Short 3" type="ushort" /> 
     </niobject>
     
     <niobject name="BSSkyShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Skyrim Sky shader block.
-        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1"></add>
-        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2"></add>
+        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="2147483648" />
+        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="33" />
         <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Source Texture" type="SizedString">points to an external texture.</add>
-        <add name="Sky Object Type" type="SkyObjectType" />
+        <add name="Sky Object Type" type="SkyObjectType" default="BSSM_SKY_CLOUDS" />
     </niobject>
 
     <niobject name="BSDismemberSkinInstance" inherit="NiSkinInstance" versions="#BETHESDA#">
@@ -6209,12 +6214,12 @@
 
     <niobject name="BSPSysSimpleColorModifier" inherit="NiPSysModifier" versions="#FO3_AND_LATER#">
         Bethesda-specific particle modifier.
-        <add name="Fade In Percent" type="float" />
-        <add name="Fade out Percent" type="float" />
+        <add name="Fade In Percent" type="float" default="0.1" />
+        <add name="Fade out Percent" type="float" default="0.9" />
         <add name="Color 1 End Percent" type="float" />
         <add name="Color 1 Start Percent" type="float" />
         <add name="Color 2 End Percent" type="float" />
-        <add name="Color 2 Start Percent" type="float" />
+        <add name="Color 2 Start Percent" type="float" default="1.0" />
         <add name="Colors" type="Color4" arr1="3" />
     </niobject>
 
@@ -6282,7 +6287,7 @@
     <niobject name="BSOrderedNode" inherit="NiNode" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
         <add name="Alpha Sort Bound" type="Vector4" />
-        <add name="Static Bound" type="bool" />
+        <add name="Static Bound" type="bool" default="1" />
     </niobject>
 
 
@@ -7039,27 +7044,27 @@
 
     <niobject name="NiPSDragForce" inherit="NiPSForce" since="V20_5_0_0">
         Applies a linear drag force to particles.
-        <add name="Drag Axis" type="Vector3" />
-        <add name="Percentage" type="float" />
-        <add name="Range" type="float" />
-        <add name="Range Falloff" type="float" />
+        <add name="Drag Axis" type="Vector3" default="#X_AXIS#" />
+        <add name="Percentage" type="float" default="0.05" />
+        <add name="Range" type="float" default="#FLT_MAX#" />
+        <add name="Range Falloff" type="float" default="#FLT_MAX#" />
         <add name="Drag Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPSGravityForce" inherit="NiPSForce" since="V20_5_0_0">
         Applies a gravitational force to particles.
-        <add name="Gravity Axis" type="Vector3" />
+        <add name="Gravity Axis" type="Vector3" default="#X_AXIS#" />
         <add name="Decay" type="float" />
         <add name="Strength" type="float" />
         <add name="Force Type" type="ForceType" />
         <add name="Turbulence" type="float" />
-        <add name="Turbulence Scale" type="float" />
+        <add name="Turbulence Scale" type="float" default="1.0" />
         <add name="Gravity Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPSBombForce" inherit="NiPSForce" since="V20_5_0_0">
         Applies an explosive force to particles.
-        <add name="Bomb Axis" type="Vector3" />
+        <add name="Bomb Axis" type="Vector3" default="#X_AXIS#" />
         <add name="Decay" type="float" />
         <add name="Delta V" type="float" />
         <add name="Decay Type" type="DecayType" />
@@ -7080,14 +7085,14 @@
     <niobject name="NiPSGravityFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of directional gravity.
         <add name="DEM Unknown Short" type="ushort" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
-        <add name="Direction" type="Vector3" />
+        <add name="Direction" type="Vector3" default="#X_AXIS#" />
         <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
     <niobject name="NiPSDragFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of drag.
         <add name="Use Direction" type="bool" />
-        <add name="Direction" type="Vector3" />
+        <add name="Direction" type="Vector3" default="#X_AXIS#" />
     </niobject>
 
     <niobject name="NiPSRadialFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
@@ -7102,7 +7107,7 @@
 
     <niobject name="NiPSVortexFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of a vortex.
-        <add name="Direction" type="Vector3" />
+        <add name="Direction" type="Vector3" default="#X_AXIS#" />
     </niobject>
 
     <!-- NiPS Emitters -->
@@ -7290,38 +7295,38 @@
         <add name="Spawner" type="Ref" template="NiPSSpawner" />
         <add name="Type" type="ColliderType" />
         <add name="Active" type="bool" />
-        <add name="Bounce" type="float" />
+        <add name="Bounce" type="float" default="1.0" />
         <add name="Spawn on Collide" type="bool" />
         <add name="Die on Collide" type="bool" />
     </niobject>
 
     <niobject name="NiPSPlanarCollider" inherit="NiPSCollider" since="V20_5_0_0">
         A planar collider for particles.
-        <add name="Width" type="float" />
-        <add name="Height" type="float" />
-        <add name="X Axis" type="Vector3" />
-        <add name="Y Axis" type="Vector3" />
+        <add name="Width" type="float" default="1.0" />
+        <add name="Height" type="float" default="1.0" />
+        <add name="X Axis" type="Vector3" default="#X_AXIS#" />
+        <add name="Y Axis" type="Vector3" default="#Y_AXIS#" />
         <add name="Collider Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPSSphericalCollider" inherit="NiPSCollider" since="V20_5_0_0">
         A spherical collider for particles.
-        <add name="Radius" type="float" />
+        <add name="Radius" type="float" default="1.0" />
         <add name="Collider Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPSSpawner" inherit="NiObject" since="V20_5_0_0">
         Creates a new particle whose initial parameters are based on an existing particle.
         <add name="Master Particle System" type="Ptr" template="NiPSParticleSystem" ver1="20.6.1.0" />
-        <add name="Percentage Spawned" type="float" />
-        <add name="Spawn Speed Factor" type="float" ver1="20.6.1.0" />
+        <add name="Percentage Spawned" type="float" default="1.0" />
+        <add name="Spawn Speed Factor" type="float" default="1.0" ver1="20.6.1.0" />
         <add name="Spawn Speed Factor Var" type="float" />
         <add name="Spawn Dir Chaos" type="float" />
         <add name="Life Span" type="float" />
         <add name="Life Span Var" type="float" />
-        <add name="Num Spawn Generations" type="ushort" />
-        <add name="Min to Spawn" type="uint" />
-        <add name="Max to Spawn" type="uint" />
+        <add name="Num Spawn Generations" type="ushort" default="1" />
+        <add name="Min to Spawn" type="uint" default="1" />
+        <add name="Max to Spawn" type="uint" default="1" />
     </niobject>
 
     <!-- NiPhysXPS -->
@@ -7569,33 +7574,47 @@
         <add name="Data" type="Ref" template="bhkCompressedMeshShapeData">The collision mesh data.</add>
     </niobject>
 
+    <enum name="hkWeldingType" storage="byte" prefix="WT">
+        <option value="0" name="ANTICLOCKWISE" />
+        <!--<option value="4" name="CLOCKWISE" />-->
+        <!--<option value="5" name="TWO_SIDED" />-->
+        <!--<option value="6" name="NONE" />-->
+    </enum>
+
+    <enum name="CMSDMatType" storage="byte" prefix="CMS">
+        <option value="1" name="SINGLE_VALUE_PER_CHUNK" />
+        <!--<option value="2" name="ONE_BYTE_PER_TRIANGLE" />-->
+        <!--<option value="3" name="TWO_BYTES_PER_TRIANGLE" />-->
+        <!--<option value="4" name="FOUR_BYTES_PER_TRIANGLE" />-->
+    </enum>
+
     <niobject name="bhkCompressedMeshShapeData" inherit="bhkRefObject" versions="#SKY_AND_LATER#">
          A compressed mesh shape for collision in Skyrim.
-		<add name="Bits Per Index" type="uint">Number of bits in the shape-key reserved for a triangle index</add>
-		<add name="Bits Per W Index" type="uint">Number of bits in the shape-key reserved for a triangle index and its winding</add>
-		<add name="Mask W Index" type="uint">Mask used to get the triangle index and winding from a shape-key (common: 262143 = 0x3ffff)</add>
-		<add name="Mask Index" type="uint">Mask used to get the triangle index from a shape-key (common: 131071 = 0x1ffff)</add>
-		<add name="Error" type="float">The radius of the storage mesh shape? Quantization error?</add>
+		<add name="Bits Per Index" type="uint" default="17">Number of bits in the shape-key reserved for a triangle index</add>
+		<add name="Bits Per W Index" type="uint" default="18">Number of bits in the shape-key reserved for a triangle index and its winding</add>
+		<add name="Mask W Index" type="uint" default="0x3FFFF">Mask used to get the triangle index and winding from a shape-key/</add>
+		<add name="Mask Index" type="uint" default="0x1FFFF">Mask used to get the triangle index from a shape-key.</add>
+		<add name="Error" type="float" default="0.001">The radius of the storage mesh shape? Quantization error?</add>
 		<add name="Bounds Min" type="Vector4">The minimum boundary of the AABB (the coordinates of the corner with the lowest numerical values)</add>
 		<add name="Bounds Max" type="Vector4">The maximum boundary of the AABB (the coordinates of the corner with the highest numerical values)</add>
-		<add name="Welding Type" type="byte" />
-		<add name="Material Type" type="byte" />
+		<add name="Welding Type" type="hkWeldingType" default="ANTICLOCKWISE" />
+		<add name="Material Type" type="CMSDMatType" default="SINGLE_VALUE_PER_CHUNK" />
 		<add name="Num Materials 32" type="uint" />
 		<add name="Materials 32" type="uint" arr1="Num Materials 32">Does not appear to be used.</add>
 		<add name="Num Materials 16" type="uint" />
 		<add name="Materials 16" type="uint" arr1="Num Materials 16">Does not appear to be used.</add>
 		<add name="Num Materials 8" type="uint" />
 		<add name="Materials 8" type="uint" arr1="Num Materials 8">Does not appear to be used.</add>
-		<add name="Num Materials" type="uint">Number of chunk materials</add>
+		<add name="Num Materials" type="uint" default="1">Number of chunk materials</add>
 		<add name="Chunk Materials" type="bhkCMSDMaterial" arr1="Num Materials">Table (array) with sets of materials. Chunks refers to this table by index.</add>
 		<add name="Num Named Materials" type="uint" />
-		<add name="Num Transforms" type="uint">Number of chunk transformations</add>
+		<add name="Num Transforms" type="uint" default="1">Number of chunk transformations</add>
         <add name="Chunk Transforms" type="bhkCMSDTransform" arr1="Num Transforms">Table (array) with sets of transformations. Chunks refers to this table by index.</add>
 		<add name="Num Big Verts" type="uint" />
 		<add name="Big Verts" type="Vector4" arr1="Num Big Verts">Compressed Vertices?</add>
         <add name="Num Big Tris" type="uint" />
         <add name="Big Tris" type="bhkCMSDBigTris" arr1="Num Big Tris" />
-        <add name="Num Chunks" type="uint" />
+        <add name="Num Chunks" type="uint" default="1" />
         <add name="Chunks" type="bhkCMSDChunk" arr1="Num Chunks" />
         <add name="Num Convex Piece A" type="uint">Does not appear to be used. Needs array.</add>
 	</niobject>
@@ -7616,7 +7635,7 @@
 
 	<niobject name="BSBoneLODExtraData" inherit="NiExtraData" versions="#SKY_AND_LATER#">
     Unknown
-		<add name="BoneLOD Count" type="uint">Number of bone entries</add>
+		<add name="BoneLOD Count" type="uint" default="3">Number of bone entries</add>
         <add name="BoneLOD Info" type="BoneLOD" arr1="BoneLOD Count">Bone Entry</add>
 	</niobject>
 	
@@ -7628,9 +7647,9 @@
 
 	<niobject name="BSLagBoneController" inherit="NiTimeController" versions="#SKY_AND_LATER#">
     A controller that trails a bone behind an actor.
-		<add name="Linear Velocity" type="float">How long it takes to rotate about an actor back to rest position.</add>
-		<add name="Linear Rotation" type="float">How the bone lags rotation</add>
-		<add name="Maximum Distance" type="float">How far bone will tail an actor.</add>
+		<add name="Linear Velocity" type="float" default="3.0">How long it takes to rotate about an actor back to rest position.</add>
+		<add name="Linear Rotation" type="float" default="1.0">How the bone lags rotation</add>
+		<add name="Maximum Distance" type="float" default="400.0">How far bone will tail an actor.</add>
 	</niobject>
 
 	<niobject name="BSLODTriShape" inherit="NiTriBasedGeom" versions="#SKY# #SSE#">
@@ -7650,9 +7669,9 @@
     
     <niobject name="BSTreeNode" inherit="NiNode" versions="#BETHESDA#">
         Node for handling Trees, Switches branch configurations for variation?
-        <add name="Num Bones 1" type="uint" />
+        <add name="Num Bones 1" type="uint" default="1" />
         <add name="Bones 1" type="Ref" arr1="Num Bones 1" template="NiNode" />
-        <add name="Num Bones 2" type="uint" />
+        <add name="Num Bones 2" type="uint" default="3" />
         <add name="Bones" type="Ref" arr1="Num Bones 2" template="NiNode" />
     </niobject>
     
@@ -7688,7 +7707,7 @@
     
     <compound name="BSGeometryPerSegmentSharedData" size="16" versions="#FO4#">
         <add name="User Index" type="uint">If Bone ID is 0xffffffff, this value refers to the Segment at the listed index. Otherwise this is the "Biped Object", which is like the body part types in Skyrim and earlier.</add>
-        <add name="Bone ID" type="uint">A hash of the bone name string.</add>
+        <add name="Bone ID" type="uint" default="#UINT_MAX#">A hash of the bone name string.</add>
         <add name="Num Cut Offsets" type="uint" calc="(#LEN[Cut Offsets]# #LT# 8) #THEN# #LEN[Cut Offsets]# #ELSE# 8">Maximum of 8.</add>
         <add name="Cut Offsets" type="float" arr1="Num Cut Offsets" />
     </compound>
@@ -7791,14 +7810,14 @@
 
     <niobject name="BSConnectPoint::Parents" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Item Slot Parent
-        <add name="Num Connect Points" type="uint" />
+        <add name="Num Connect Points" type="uint" default="1" />
         <add name="Connect Points" type="BSConnectPoint" arr1="Num Connect Points" />
     </niobject>
 
     <niobject name="BSConnectPoint::Children" inherit="NiExtraData" versions="#FO4#">
         Fallout 4 Item Slot Child
         <add name="Skinned" type="bool" />
-        <add name="Num Points" type="uint" />
+        <add name="Num Points" type="uint" default="1" />
         <add name="Point Name" type="SizedString" arr1="Num Points" />
     </niobject>
     

From 847607fa640dc189d6ba51f9252fffd53560c9a6 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sat, 30 Jun 2018 22:11:57 -0400
Subject: [PATCH 62/86] BSWaterShaderProperty flags correction

The previous decoding was all guesswork, though did align somewhat.  Enough to know that the decoding from FO4 applies to Skyrim as well.
---
 nif.xml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/nif.xml b/nif.xml
index afd52c0..dabe1bf 100644
--- a/nif.xml
+++ b/nif.xml
@@ -6167,16 +6167,22 @@
         <add name="Environment Map Scale" type="float" vercond="#BS_FO4#" />
     </niobject>
     
-    <bitflags name="SkyrimWaterShaderFlags" storage="byte" versions="#SKY_AND_LATER#">
+    <bitflags name="WaterShaderPropertyFlags" storage="uint" prefix="BSWSP" versions="#SKY_AND_LATER#">
         Skyrim water shader property flags
-        <option value="0" name="SWSF1_UNKNOWN0">Unknown</option>
-        <option value="1" name="SWSF1_Bypass_Refraction_Map">Bypasses refraction map when set to 1</option>
-        <option value="2" name="SWSF1_Water_Toggle">Main water Layer on/off</option>
-        <option value="3" name="SWSF1_UNKNOWN3">Unknown</option>
-        <option value="4" name="SWSF1_UNKNOWN4">Unknown</option>
-        <option value="5" name="SWSF1_UNKNOWN5">Unknown</option>
-        <option value="6" name="SWSF1_Highlight_Layer_Toggle">Reflection layer 2 on/off. (is this scene reflection?)</option>
-        <option value="7" name="SWSF1_Enabled">Water layer on/off</option>
+        <option value="0" name="DISPLACEMENT" />
+        <option value="1" name="LOD" />
+        <option value="2" name="DEPTH" />
+        <option value="3" name="ACTOR_IN_WATER" />
+        <option value="4" name="ACTOR_IN_WATER_IS_MOVING" />
+        <option value="5" name="UNDERWATER" />
+        <option value="6" name="REFLECTIONS" />
+        <option value="7" name="REFRACTIONS" />
+        <option value="8" name="VERTEX_UV" />
+        <option value="9" name="VERTEX_ALPHA_DEPTH" />
+        <option value="10" name="PROCEDURAL" />
+        <option value="11" name="FOG" />
+        <option value="12" name="UPDATE_CONSTANTS" />
+        <option value="13" name="CUBEMAP" />
     </bitflags>
     
     <niobject name="BSWaterShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
@@ -6185,9 +6191,7 @@
         <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="33" />
         <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
-        <add name="Water Shader Flags" type="SkyrimWaterShaderFlags" default="196">Defines attributes for the water shader (will use SkyrimWaterShaderFlags)</add>
-        <add name="Water Direction" type="byte" default="0">A bitflag, only the first/second bit controls water flow positive or negative along UVs.</add>
-        <add name="Unknown Short 3" type="ushort" /> 
+        <add name="Water Shader Flags" type="WaterShaderPropertyFlags" default="196" />
     </niobject>
     
     <niobject name="BSSkyShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">

From c76b429918a88d7b6ebe12df088e77bedd9bf811 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Mon, 2 Jul 2018 00:25:23 -0400
Subject: [PATCH 63/86] NiAlphaProperty flags Bethesda-only bits

---
 nif.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nif.xml b/nif.xml
index dabe1bf..e3a4fae 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1430,6 +1430,8 @@
         <member width="1" pos="9" mask="0x0200" name="Alpha Test" type="bool" default="1" />
         <member width="3" pos="10" mask="0x1C00" name="Test Func" type="TestFunction" default="TEST_GREATER" />
         <member width="1" pos="13" mask="0x2000" name="No Sorter" type="bool" />
+        <member width="1" pos="14" mask="0x4000" name="Clone Unique" type="bool">Bethesda-only. Always true for weapon blood after FO3.</member>
+        <member width="1" pos="15" mask="0x8000" name="Editor Alpha Threshold" type="bool">Bethesda-only. True if the Alpha Threshold is externally controlled.</member>
     </bitfield>
 
     <bitfield name="FogFlags" storage="ushort">

From 111598d26658a1b1b50e8d83bdfdf60c475df67f Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sun, 15 Jul 2018 22:45:44 -0400
Subject: [PATCH 64/86] Bethesda Havok major refactor

Cleaned up class naming e.g. Descriptor->CInfo to match the engine and other classes already named that way.  Added hk/bhk to front of type names where appropriate.

Changed Info/Property names to be consistent e.g.  "Rigid Body Info", "Entity Info" instead of CInfo.

Changed all "Unused" fields to a consistent naming scheme, using byte array types and binary="true".

Class hierarchy fixes.  Class documentation complete overhaul.

Some existing naming collides with new naming of different fields, e.g. bhkMoppBvTreeShape "Scale" used to be "Shape Scale" and now "Scale" is  "MOPP Code" -> "Scale".
---
 nif.xml | 496 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 276 insertions(+), 220 deletions(-)

diff --git a/nif.xml b/nif.xml
index e3a4fae..2a2b735 100644
--- a/nif.xml
+++ b/nif.xml
@@ -753,8 +753,8 @@
         <option value="28" name="P_ADDON_ARM">AddonArm</option>
     </enum>
 
-    <enum name="MoppDataBuildType" storage="byte" versions="#SKY_AND_LATER#">
-        Bethesda Havok.
+    <enum name="hkMoppCodeBuildType" storage="byte" versions="#SKY_AND_LATER#">
+        hkpMoppCode::BuildType
         A byte describing if MOPP Data is organized into chunks (PS3) or not (PC)
         <option value="0" name="BUILT_WITH_CHUNK_SUBDIVISION">Organized in chunks for PS3.</option>
         <option value="1" name="BUILT_WITHOUT_CHUNK_SUBDIVISION">Not organized in chunks for PC. (Default)</option>
@@ -998,7 +998,7 @@
     </enum>
 
     <enum name="hkMotionType" storage="byte" versions="#BETHESDA#">
-        Bethesda Havok, based on hkpMotion::MotionType. Motion type of a rigid body determines what happens when it is simulated.
+        hkpMotion::MotionType. Motion type of a rigid body determines what happens when it is simulated.
         <option value="0" name="MO_SYS_INVALID">Invalid</option>
         <option value="1" name="MO_SYS_DYNAMIC">A fully-simulated, movable rigid body. At construction time the engine checks the input inertia and selects MO_SYS_SPHERE_INERTIA or MO_SYS_BOX_INERTIA as appropriate.</option>
         <option value="2" name="MO_SYS_SPHERE_INERTIA">Simulation is performed using a sphere inertia tensor.</option>
@@ -1012,15 +1012,14 @@
     </enum>
 
     <enum name="hkDeactivatorType" storage="byte" versions="#BETHESDA#">
-        Bethesda Havok, based on hkpRigidBodyDeactivator::DeactivatorType.
-        Deactivator Type determines which mechanism Havok will use to classify the body as deactivated.
+        hkpRigidBodyDeactivator::DeactivatorType. Deactivator Type determines which mechanism Havok will use to classify the body as deactivated.
         <option value="0" name="DEACTIVATOR_INVALID">Invalid</option>
         <option value="1" name="DEACTIVATOR_NEVER">This will force the rigid body to never deactivate.</option>
         <option value="2" name="DEACTIVATOR_SPATIAL">Tells Havok to use a spatial deactivation scheme. This makes use of high and low frequencies of positional motion to determine when deactivation should occur.</option>
     </enum>
 
     <enum name="hkSolverDeactivation" storage="byte" versions="#BETHESDA#">
-        Bethesda Havok, based on hkpRigidBodyCinfo::SolverDeactivation.
+        hkpRigidBodyCinfo::SolverDeactivation.
         A list of possible solver deactivation settings. This value defines how aggressively the solver deactivates objects.
         Note: Solver deactivation does not save CPU, but reduces creeping of movable objects in a pile quite dramatically.
         <option value="0" name="SOLVER_DEACTIVATION_INVALID">Invalid</option>
@@ -1032,7 +1031,7 @@
     </enum>
 
     <enum name="hkQualityType" storage="byte" versions="#BETHESDA#">
-        Bethesda Havok, based on hkpCollidableQualityType. Describes the priority and quality of collisions for a body,
+        hkpCollidableQualityType. Describes the priority and quality of collisions for a body,
             e.g. you may expect critical game play objects to have solid high-priority collisions so that they never sink into ground,
             or may allow penetrations for visual debris objects.
         Notes:
@@ -1177,7 +1176,7 @@
     </enum>
 
     <enum name="hkResponseType" storage="byte" versions="#BETHESDA#">
-        Bethesda Havok.
+        hkpMaterial::ResponseType
         <option value="0" name="RESPONSE_INVALID">Invalid Response</option>
         <option value="1" name="RESPONSE_SIMPLE_CONTACT">Do normal collision resolution</option>
         <option value="2" name="RESPONSE_REPORTING">No collision resolution is performed but listeners are called</option>
@@ -1358,7 +1357,7 @@
     </enum>
 
     <enum name="hkConstraintType" storage="uint" versions="#BETHESDA#">
-        Bethesda Havok. Describes the type of bhkConstraint.
+        hkpConstraintData::ConstraintType. Describes the type of bhkConstraint.
         <option value="0" name="BallAndSocket">A ball and socket constraint.</option>
         <option value="1" name="Hinge">A hinge constraint.</option>
         <option value="2" name="Limited Hinge">A limited hinge constraint.</option>
@@ -2123,14 +2122,46 @@
         <add name="Material" suffix="SK" type="SkyrimHavokMaterial" vercond="(#VER# == 20.2.0.7) #AND# #BS_GT_FO3#">The material of the shape.</add>
     </compound>
 
-    <compound name="OblivionSubShape" versions="#BETHESDA#">
+    <compound name="hkSubPartData" versions="#BETHESDA#">
         Bethesda Havok. Havok Information for packed TriStrip shapes.
         <add name="Havok Filter" type="HavokFilter" />
         <add name="Num Vertices" type="uint">The number of vertices that form this sub shape.</add>
         <add name="Material" type="HavokMaterial">The material of the subshape.</add>
     </compound>
 
+    <compound name="hkAabb" versions="#BETHESDA#">
+        Havok AABB using min/max coordinates instead of center/half extents.
+        <add name="Min" type="Vector4">Coordinates of the corner with the lowest numerical values.</add>
+        <add name="Max" type="Vector4">Coordinates of the corner with the highest numerical values.</add>
+    </compound>
+
+    <enum name="ConstraintPriority" storage="uint" versions="#BETHESDA#">
+        hkpConstraintInstance::ConstraintPriority. Priority used for the constraint.
+        Values 2, 4, and 5 are unused or internal use only.
+        <option value="0" name="PRIORITY_INVALID" />
+        <option value="1" name="PRIORITY_PSI">Constraint is only solved at regular physics time steps.</option>
+        <option value="3" name="PRIORITY_TOI">Constraint is also solved at time of impact events.</option>
+    </enum>
+
+    <compound name="bhkConstraintCInfo" size="16" versions="#BETHESDA#">
+        Bethesda extension of hkpConstraintInstance.
+        <add name="Num Entities" type="uint" default="2">Always 2 (Hardcoded). Number of bodies affected by this constraint.</add>
+        <add name="Entity A" type="Ptr" template="bhkEntity">The entity affected by this constraint.</add>
+        <add name="Entity B" type="Ptr" template="bhkEntity">The entity affected by this constraint.</add>
+        <add name="Priority" type="ConstraintPriority" default="PRIORITY_PSI">Either PSI or TOI priority. TOI is higher priority.</add>
+    </compound>
+
+    <compound name="bhkConstraintChainCInfo" versions="#BETHESDA#">
+        Bethesda extension of hkpConstraintChainInstance.
+        <add name="Num Chained Entities" type="uint" />
+        <add name="Chained Entities" type="Ptr" template="bhkRigidBody" arr1="Num Chained Entities" />
+        <add name="Constraint Info" type="bhkConstraintCInfo" />
+    </compound>
+
     <compound name="bhkPositionConstraintMotor" size="25" versions="#BETHESDA#">
+        Bethesda extension of hkpPositionConstraintMotor.
+        A motor which tries to reach a desired position/angle given a max force and recovery speed.
+        This motor is a good choice for driving a ragdoll to a given pose.
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
         <add name="Tau" type="float" default="0.8">Relative stiffness</add>
@@ -2141,6 +2172,7 @@
     </compound>
 
     <compound name="bhkVelocityConstraintMotor" size="18" versions="#BETHESDA#">
+        Bethesda extension of hkpVelocityConstraintMotor. Tries to reach and keep a desired target velocity.
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
         <add name="Tau" type="float" default="0">Relative stiffness</add>
@@ -2150,29 +2182,33 @@
     </compound>
 
     <compound name="bhkSpringDamperConstraintMotor" size="17" versions="#BETHESDA#">
+        Bethesda extension of hkpSpringDamperConstraintMotor.
+        Tries to reach a given target position using an angular spring which has a spring constant.
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
         <add name="Spring Constant" type="float" default="0">The spring constant in N/m</add>
-        <add name="Spring Damping" type="float" default="0">The spring damping in Nsec/m</add>       
+        <add name="Spring Damping" type="float" default="0">The spring damping in Nsec/m</add>
         <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
     </compound>
     
-    <enum name="MotorType" storage="byte" versions="#BETHESDA#">
+    <enum name="hkMotorType" storage="byte" versions="#BETHESDA#">
         <option value="0" name="MOTOR_NONE" />
         <option value="1" name="MOTOR_POSITION" />
         <option value="2" name="MOTOR_VELOCITY" />
         <option value="3" name="MOTOR_SPRING" />
     </enum>
 
-    <compound name="MotorDescriptor" versions="#BETHESDA#">
-        <add name="Type" type="MotorType" default="MOTOR_NONE" />
+    <compound name="bhkConstraintMotorCInfo" versions="#BETHESDA#">
+        hkConstraintCinfo::SaveMotor(). Not a Bethesda extension of hkpConstraintMotor, but a wrapper for its serialization function. 
+        <add name="Type" type="hkMotorType" default="MOTOR_NONE" />
         <add name="Position Motor" type="bhkPositionConstraintMotor" cond="Type == 1" />
         <add name="Velocity Motor" type="bhkVelocityConstraintMotor" cond="Type == 2" />
         <add name="Spring Damper Motor" type="bhkSpringDamperConstraintMotor" cond="Type == 3" />
     </compound>
 
-    <compound name="RagdollDescriptor" versions="#BETHESDA#">
-        This constraint defines a cone in which an object can rotate. The shape of the cone can be controlled in two (orthogonal) directions.
+    <compound name="bhkRagdollConstraintCInfo" versions="#BETHESDA#">
+        Serialization data for bhkRagdollConstraint.
+        The area of movement can be represented as a main cone + 2 orthogonal cones which may subtract from the main cone volume depending on limits.
         <!-- Oblivion and Fallout 3, Havok 550 -->
         <add name="Pivot A" type="Vector4" vercond="#NI_BS_LTE_16#">The point where the constraint is attached to its parent rigidbody.</add>
         <add name="Plane A" type="Vector4" vercond="#NI_BS_LTE_16#">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</add>
@@ -2198,10 +2234,11 @@
         <add name="Twist Max Angle" type="float">Maximum angle the object can rotate around Twist A, relative to Plane A.</add>
         <add name="Max Friction" type="float">Maximum friction, typically 0 or 10. In Fallout 3, typically 100.</add>
 
-        <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
+        <add name="Motor" type="bhkConstraintMotorCInfo" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
     </compound>
 
-    <compound name="LimitedHingeDescriptor" versions="#BETHESDA#">
+    <compound name="bhkLimitedHingeConstraintCInfo" versions="#BETHESDA#">
+        Serialization data for bhkLimitedHingeConstraint.
         This constraint allows rotation about a specified axis, limited by specified boundaries.
     
         <!-- Oblivion and Fallout 3, Havok 550 -->
@@ -2228,11 +2265,11 @@
         <add name="Max Angle" type="float">Maximum rotation angle.</add>
         <add name="Max Friction" type="float">Maximum friction, typically either 0 or 10. In Fallout 3, typically 100.</add>
 
-        <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
+        <add name="Motor" type="bhkConstraintMotorCInfo" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
     </compound>
 
-    <compound name="HingeDescriptor" versions="#BETHESDA#">
-    	This constraint allows rotation about a specified axis. 
+    <compound name="bhkHingeConstraintCInfo" versions="#BETHESDA#">
+        Serialization data for bhkHingeConstraint. A basic hinge with no angular limits or motor.
         <!-- Oblivion -->
         <add name="Pivot A" type="Vector4" ver2="20.0.0.5">Pivot point around which the object will rotate.</add>
         <add name="Perp Axis In A1" type="Vector4" ver2="20.0.0.5">Vector in the rotation plane which defines the zero angle.</add>
@@ -2251,12 +2288,17 @@
         <add name="Pivot B" type="Vector4" ver1="20.2.0.7">Pivot A in second entity coordinate system.</add>
     </compound>
 
-    <compound name="BallAndSocketDescriptor" size="32" versions="#BETHESDA#">
-        <add name="Pivot A" type="Vector4">Pivot point in the local space of entity A.</add>
-        <add name="Pivot B" type="Vector4">Pivot point in the local space of entity B.</add>
+    <compound name="bhkBallAndSocketConstraintCInfo" size="32" versions="#BETHESDA#">
+        Serialization data for bhkBallAndSocketConstraint.
+        Point-to-point constraint that attempts to keep the pivot point of two bodies in the same space.
+        <add name="Pivot A" type="Vector4">Constraint pivot in Entity A space.</add>
+        <add name="Pivot B" type="Vector4">Constraint pivot in Entity B space.</add>
     </compound>
 
-    <compound name="PrismaticDescriptor" versions="#BETHESDA#">
+    <compound name="bhkPrismaticConstraintCInfo" versions="#BETHESDA#">
+        Serialization data for bhkPrismaticConstraint.
+        Creates a rail between two bodies that allows translation along a single axis with linear limits and a motor.
+        All three rotation axes and the remaining two translation axes are fixed.
         <!-- Oblivion -->
         <add name="Pivot A" type="Vector4" ver2="20.0.0.5">Pivot.</add>
         <add name="Rotation A" type="Vector4" ver2="20.0.0.5">Rotation axis.</add>
@@ -2280,12 +2322,13 @@
 
         <add name="Min Distance" type="float">Describe the min distance the object is able to travel.</add>
         <add name="Max Distance" type="float">Describe the max distance the object is able to travel.</add>
-        <add name="Friction" type="float" >Friction.</add>
+        <add name="Friction" type="float">Friction.</add>
 
-        <add name="Motor" type="MotorDescriptor" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
+        <add name="Motor" type="bhkConstraintMotorCInfo" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
     </compound>
 
-    <compound name="StiffSpringDescriptor" size="36" versions="#BETHESDA#">
+    <compound name="bhkStiffSpringConstraintCInfo" size="36" versions="#BETHESDA#">
+        bhkStiffSpringConstraint serialization data. Holds two bodies at a specified distance from one another.
         <add name="Pivot A" type="Vector4" />
         <add name="Pivot B" type="Vector4" />
         <add name="Length" type="float" />
@@ -2381,29 +2424,27 @@
         <add name="Bone Name" type="string" />
     </compound>
 
-    <compound name="bhkCMSDMaterial" size="8" versions="#SKY_AND_LATER#">
-        Per-chunk material, used in bhkCompressedMeshShapeData
+    <compound name="bhkMeshMaterial" size="8" versions="#SKY_AND_LATER#">
+        hkpBSMaterial, a subclass of hkpMeshMaterial. hkpMeshMaterial is a base class for material info for hkMeshShapes.
         <add name="Material" type="SkyrimHavokMaterial" />
         <add name="Filter" type="HavokFilter" />
     </compound>
 
-    <compound name="bhkCMSDBigTris" size="12" versions="#SKY_AND_LATER#">
-        Triangle indices used in pair with "Big Verts" in a bhkCompressedMeshShapeData.
-        <add name="Triangle 1" type="ushort" />
-        <add name="Triangle 2" type="ushort" />
-        <add name="Triangle 3" type="ushort" />
+    <compound name="bhkCMSBigTri" size="12" versions="#SKY_AND_LATER#">
+        Bethesda extension of hkpCompressedMeshShape::BigTriangle. Triangles that don't fit the maximum size.
+        <add name="Triangle" type="Triangle" />
         <add name="Material" type="uint" />
         <add name="Welding Info" type="ushort" />
     </compound>
     
-    <compound name="bhkCMSDTransform" size="32" versions="#SKY_AND_LATER#">
-        A set of transformation data: translation and rotation
+    <compound name="bhkQsTransform" size="32" versions="#SKY_AND_LATER#">
+        Bethesda extension of hkQsTransform. The scale vector is not serialized.
         <add name="Translation" type="Vector4">A vector that moves the chunk by the specified amount. W is not used.</add>
         <add name="Rotation" type="hkQuaternion">Rotation. Reference point for rotation is bhkRigidBody translation.</add>
     </compound>
     
-    <compound name="bhkCMSDChunk" versions="#SKY_AND_LATER#">
-        Defines subshape chunks in bhkCompressedMeshShapeData
+    <compound name="bhkCMSChunk" versions="#SKY_AND_LATER#">
+        Bethesda extension of hkpCompressedMeshShape::Chunk. A compressed chunk of hkpCompressedMeshShape geometry.
         <add name="Translation" type="Vector4" />
         <add name="Material Index" type="uint">Index of material in bhkCompressedMeshShapeData::Chunk Materials</add>
         <add name="Reference" type="ushort" default="#USHRT_MAX#">Index of another chunk in the chunks list.</add>
@@ -2418,36 +2459,32 @@
         <add name="Welding Info" type="ushort" arr1="Num Welding Info" />
     </compound>
 
-    <compound name="MalleableDescriptor" versions="#BETHESDA#">
+    <compound name="bhkMalleableConstraintCInfo" versions="#BETHESDA#">
+        bhkMalleableConstraint serialization data. A constraint wrapper used to soften or harden constraints.
         <add name="Type" type="hkConstraintType">Type of constraint.</add>
-        <add name="Num Entities" type="uint" default="2">Always 2 (Hardcoded). Number of bodies affected by this constraint.</add>
-        <add name="Entity A" type="Ptr" template="bhkEntity">Usually NONE. The entity affected by this constraint.</add>
-        <add name="Entity B" type="Ptr" template="bhkEntity">Usually NONE. The entity affected by this constraint.</add>
-        <add name="Priority" type="uint" default="1">Usually 1. Higher values indicate higher priority of this constraint?</add>
-        <add name="Ball and Socket" type="BallAndSocketDescriptor" cond="Type == 0" />
-        <add name="Hinge" type="HingeDescriptor" cond="Type == 1" />
-        <add name="Limited Hinge" type="LimitedHingeDescriptor" cond="Type == 2" />
-        <add name="Prismatic" type="PrismaticDescriptor" cond="Type == 6" />
-        <add name="Ragdoll" type="RagdollDescriptor" cond="Type == 7" />
-        <add name="Stiff Spring" type="StiffSpringDescriptor" cond="Type == 8" />
+        <add name="Constraint Info" type="bhkConstraintCInfo" />
+        <add name="Ball and Socket" type="bhkBallAndSocketConstraintCInfo" cond="Type == 0" />
+        <add name="Hinge" type="bhkHingeConstraintCInfo" cond="Type == 1" />
+        <add name="Limited Hinge" type="bhkLimitedHingeConstraintCInfo" cond="Type == 2" />
+        <add name="Prismatic" type="bhkPrismaticConstraintCInfo" cond="Type == 6" />
+        <add name="Ragdoll" type="bhkRagdollConstraintCInfo" cond="Type == 7" />
+        <add name="Stiff Spring" type="bhkStiffSpringConstraintCInfo" cond="Type == 8" />
         <add name="Tau" type="float" ver2="20.0.0.5" />
         <add name="Damping" type="float" ver2="20.0.0.5" />
         <add name="Strength" type="float" ver1="20.2.0.7" />
     </compound>
 
-    <compound name="ConstraintData" versions="#BETHESDA#">
+    <compound name="bhkWrappedConstraintData" versions="#BETHESDA#">
+        A constraint wrapper for polymorphic hkpConstraintData serialization.
         <add name="Type" type="hkConstraintType">Type of constraint.</add>
-        <add name="Num Entities 2" type="uint" default="2">Always 2 (Hardcoded). Number of bodies affected by this constraint.</add>
-        <add name="Entity A" type="Ptr" template="bhkEntity">Usually NONE. The entity affected by this constraint.</add>
-        <add name="Entity B" type="Ptr" template="bhkEntity">Usually NONE. The entity affected by this constraint.</add>
-        <add name="Priority" type="uint" default="1">Usually 1. Higher values indicate higher priority of this constraint?</add>
-        <add name="Ball and Socket" type="BallAndSocketDescriptor" cond="Type == 0" />
-        <add name="Hinge" type="HingeDescriptor" cond="Type == 1" />
-        <add name="Limited Hinge" type="LimitedHingeDescriptor" cond="Type == 2" />
-        <add name="Prismatic" type="PrismaticDescriptor" cond="Type == 6" />
-        <add name="Ragdoll" type="RagdollDescriptor" cond="Type == 7" />
-        <add name="Stiff Spring" type="StiffSpringDescriptor" cond="Type == 8" />
-        <add name="Malleable" type="MalleableDescriptor" cond="Type == 13" />
+        <add name="Constraint Info" type="bhkConstraintCInfo" />
+        <add name="Ball and Socket" type="bhkBallAndSocketConstraintCInfo" cond="Type == 0" />
+        <add name="Hinge" type="bhkHingeConstraintCInfo" cond="Type == 1" />
+        <add name="Limited Hinge" type="bhkLimitedHingeConstraintCInfo" cond="Type == 2" />
+        <add name="Prismatic" type="bhkPrismaticConstraintCInfo" cond="Type == 6" />
+        <add name="Ragdoll" type="bhkRagdollConstraintCInfo" cond="Type == 7" />
+        <add name="Stiff Spring" type="bhkStiffSpringConstraintCInfo" cond="Type == 8" />
+        <add name="Malleable" type="bhkMalleableConstraintCInfo" cond="Type == 13" />
     </compound>
 
     <!-- NIF Objects
@@ -2527,46 +2564,57 @@
         <option value="3" name="BROAD_PHASE_BORDER" />
     </enum>
 
-    <compound name="hkWorldObjCinfoProperty" size="12" versions="#BETHESDA#">
-        <add name="Data" type="uint" default="0" />
-        <add name="Size" type="uint" default="0" />
-        <add name="Capacity and Flags" type="uint" default="0x80000000" />
-    </compound>
-
     <niobject name="bhkRefObject" abstract="true" inherit="NiObject" versions="#BETHESDA#">
-        The base type of most Bethesda-specific Havok-related NIF objects.
+        Bethesda extension of hkReferencedObject, the base for all classes in the Havok SDK.
     </niobject>
 
     <niobject name="bhkSerializable" abstract="true" inherit="bhkRefObject" versions="#BETHESDA#">
-        Havok objects that can be saved and loaded from disk?
+        Bethesda class to combine NiObject and hkReferencedObject so that Havok classes can be read/written with NiStream.
     </niobject>
 
+    <compound name="bhkWorldObjCInfoProperty" size="12" versions="#BETHESDA#">
+        hkWorldObjectCinfo::Property struct
+        <add name="Data" type="uint" default="0" />
+        <add name="Size" type="uint" default="0" />
+        <add name="Capacity and Flags" type="uint" default="0x80000000" />
+    </compound>
+
     <compound name="bhkWorldObjectCInfo">
         <add name="Unused 01" type="byte" arr1="4" binary="true" />
         <add name="Broad Phase Type" type="BroadPhaseType" default="BROAD_PHASE_ENTITY" />
         <add name="Unused 02" type="byte" arr1="3" binary="true" />
-        <add name="Cinfo Property" type="hkWorldObjCinfoProperty" />
+        <add name="Property" type="bhkWorldObjCInfoProperty" />
     </compound>
 
     <niobject name="bhkWorldObject" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
-        Havok objects that have a position in the world?
-        <add name="Shape" type="Ref" template="bhkShape"> Link to the body for this collision object.</add>
+        Bethesda extension of hkpWorldObject, the base class for hkpEntity and hkpPhantom.
+        <add name="Shape" type="Ref" template="bhkShape">The shape for this collision object.</add>
         <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
         <add name="Havok Filter" type="HavokFilter" />
-        <add name="World Object CInfo" type="bhkWorldObjectCInfo" />
+        <add name="World Object Info" type="bhkWorldObjectCInfo" />
     </niobject>
 
     <niobject name="bhkPhantom" abstract="true" inherit="bhkWorldObject" versions="#BETHESDA#">
-        Havok object that do not react with other objects when they collide (causing deflection, etc.) but still trigger collision notifications to the game.  Possible uses are traps, portals, AI fields, etc.
+        Bethesda extension of hkpPhantom. A Phantom is the core non-physical object in the system.
+        Receives events when an overlap with another phantom or an entity begins or ends.
+    </niobject>
+
+    <niobject name="bhkAabbPhantom" inherit="bhkPhantom" versions="#BETHESDA#">
+        Bethesda extension of hkpAabbPhantom. A non-physical object made up of only an AABB.
+            - Very fast as they use only broadphase collision detection.
+            - Used for triggers/regions where a shape is not necessary.
+        <add name="Unused 01" type="byte" arr1="8" binary="true" />
+        <add name="AABB" type="hkAabb" />
     </niobject>
 
     <niobject name="bhkShapePhantom" abstract="true" inherit="bhkPhantom" versions="#BETHESDA#">
-        A Havok phantom that uses a Havok shape object for its collision volume instead of just a bounding box.
+        Bethesda extension of hkpShapePhantom, a base for hkpSimpleShapePhantom and hkpCachingShapePhantom.
     </niobject>
 
     <niobject name="bhkSimpleShapePhantom" inherit="bhkShapePhantom" versions="#BETHESDA#">
-        Unknown shape.
-        <add name="Unused 2" type="byte" arr1="8" binary="true">Garbage data from memory.</add>
+        Bethesda extension of hkpSimpleShapePhantom. A Phantom with arbitrary shape and transform.
+        Does not do any narrowphase caching, in contrast to hkpCachingShapePhantom.
+        <add name="Unused 01" type="byte" arr1="8" binary="true" />
         <add name="Transform" type="Matrix44" />
     </niobject>
 
@@ -2577,8 +2625,8 @@
     </compound>
 
     <niobject name="bhkEntity" abstract="true" inherit="bhkWorldObject" versions="#BETHESDA#">
-        A havok node, describes physical properties.
-        <add name="Entity CInfo" type="bhkEntityCInfo" />
+        Bethesda extension of hkpEntity. An Entity is the core physical object in the system.
+        <add name="Entity Info" type="bhkEntityCInfo" />
     </niobject>
 
     <compound name="bhkRigidBodyCInfo550_660">
@@ -2614,7 +2662,7 @@
         <add name="Deactivator Type" type="hkDeactivatorType" default="DEACTIVATOR_NEVER">The initial deactivator type of the body.</add>
         <add name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</add>
         <add name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED">The type of interaction with other objects.</add>
-        <add name="Unknown Bytes 1" type="byte" arr1="12" />
+        <add name="Unused 05" type="byte" arr1="12" binary="true" />
     </compound>
 
     <compound name="bhkRigidBodyCInfo2010">
@@ -2657,7 +2705,7 @@
         <add name="Response Modifier Flags" type="byte" />
         <add name="Num Shape Keys in Contact Point" type="byte" default="3" />
         <add name="Force Collided Onto PPU" type="bool" />
-        <add name="Unknown Bytes 1" type="byte" arr1="12" />
+        <add name="Unused 04" type="byte" arr1="12" binary="true" />
     </compound>
 
     <compound name="bhkRigidBodyCInfo2014">
@@ -2701,16 +2749,16 @@
         <add name="Response Modifier Flags" type="byte" />
         <add name="Num Shape Keys in Contact Point" type="byte" default="3" />
         <add name="Force Collided Onto PPU" type="bool" />
-        <add name="Unused 06" type="byte" arr1="3" />
+        <add name="Unused 06" type="byte" arr1="3" binary="true" />
     </compound>
 
     <niobject name="bhkRigidBody" inherit="bhkEntity" versions="#BETHESDA#">
         This is the default body type for all "normal" usable and static world objects. The "T" suffix
         marks this body as active for translation and rotation, a normal bhkRigidBody ignores those
         properties. Because the properties are equal, a bhkRigidBody may be renamed into a bhkRigidBodyT and vice-versa.
-        <add name="Rigid Body CInfo" suffix="550_660" type="bhkRigidBodyCInfo550_660" vercond="#NI_BS_LTE_FO3#" />
-        <add name="Rigid Body CInfo" suffix="2010" type="bhkRigidBodyCInfo2010" vercond="#BS_GTE_SKY# #AND# (!#BS_FO4#)" />
-        <add name="Rigid Body CInfo" suffix="2014" type="bhkRigidBodyCInfo2014" vercond="#BS_FO4#" />
+        <add name="Rigid Body Info" suffix="550_660" type="bhkRigidBodyCInfo550_660" vercond="#NI_BS_LTE_FO3#" />
+        <add name="Rigid Body Info" suffix="2010" type="bhkRigidBodyCInfo2010" vercond="#BS_GTE_SKY# #AND# (!#BS_FO4#)" />
+        <add name="Rigid Body Info" suffix="2014" type="bhkRigidBodyCInfo2014" vercond="#BS_FO4#" />
         <add name="Num Constraints" type="uint" />
         <add name="Constraints" type="Ref" template="bhkSerializable" arr1="Num Constraints" />
         <add name="Body Flags" type="uint" vercond="#BSVER# #LT# 76">1 = respond to wind</add>
@@ -2721,68 +2769,80 @@
         The "T" suffix marks this body as active for translation and rotation.
     </niobject>
 
+
+    <niobject name="bhkAction" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
+        Bethesda extension of hkpAction. hkpAction performs some action on a body or bodies during every simulation step.
+    </niobject>
+
+    <niobject name="bhkUnaryAction" abstract="true" inherit="bhkAction" versions="#BETHESDA#">
+        Bethesda extension of hkpUnaryAction. hkpUnaryAction performs an action on one body.
+        <add name="Entity" type="Ptr" template="bhkRigidBody" />
+        <add name="Unused 01" type="byte" arr1="8" binary="true" />
+    </niobject>
+
+    <niobject name="bhkBinaryAction" abstract="true" inherit="bhkAction" versions="#BETHESDA#">
+        Bethesda extension of hkpBinaryAction. hkpBinaryAction performs an action on two bodies.
+        <add name="Entity A" type="Ptr" template="bhkRigidBody" />
+        <add name="Entity B" type="Ptr" template="bhkRigidBody" />
+        <add name="Unused 01" type="byte" arr1="8" binary="true" />
+    </niobject>
+
     <niobject name="bhkConstraint" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
-        Describes a physical constraint.
-        <add name="Num Entities" type="uint">Number of bodies affected by this constraint.</add>
-        <add name="Entities" type="Ptr" template="bhkEntity" arr1="Num Entities">The entities affected by this constraint.</add>
-        <add name="Priority" type="uint" default="1">Usually 1. Higher values indicate higher priority of this constraint?</add>
+        Bethesda extension of hkpConstraintData. Base class for all constraints. 
+        <add name="Constraint Info" type="bhkConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkLimitedHingeConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
-        Hinge constraint.
-        <add name="Limited Hinge" type="LimitedHingeDescriptor">Describes a limited hinge constraint</add>
+        Bethesda extension of hkpLimitedHingeConstraintData. Hinge constraint with limits and a motor.
+        Enabling the motor will remove any friction.
+        <add name="Constraint" type="bhkLimitedHingeConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkMalleableConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
-        A malleable constraint.
-        <add name="Malleable" type="MalleableDescriptor">Constraint within constraint.</add>
+        Bethesda extension of hkpMalleableConstraintData. Constraint wrapper used to soften or harden constraints.
+        Does not affect angular limits or angular motors.
+        <add name="Constraint" type="bhkMalleableConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkStiffSpringConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
-        A spring constraint.
-        <add name="Stiff Spring" type="StiffSpringDescriptor">Stiff Spring constraint.</add>
+        Bethesda extension of hkpStiffSpringConstraintData. Holds two bodies at a specified distance from one another.
+        <add name="Constraint" type="bhkStiffSpringConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkRagdollConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
-        Ragdoll constraint.
-        <add name="Ragdoll" type="RagdollDescriptor">Ragdoll constraint.</add>
+        Bethesda extension of hkpRagdollConstraintData. Creates a joint between two bodies with 3 degrees of freedom and a motor.
+        Enabling the motor will remove any friction.
+        The area of movement can be represented as a main cone + 2 orthogonal cones which may subtract from the main cone volume depending on limits. 
+        <add name="Constraint" type="bhkRagdollConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkPrismaticConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
-        A prismatic constraint.
-        <add name="Prismatic" type="PrismaticDescriptor">Describes a prismatic constraint</add>
+        Bethesda extension of hkpPrismaticConstraintData.
+        Creates a rail between two bodies that allows translation along a single axis with linear limits and a motor.
+        All three rotation axes and the remaining two translation axes are fixed.
+        <add name="Constraint" type="bhkPrismaticConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkHingeConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
-        A hinge constraint.
-        <add name="Hinge" type="HingeDescriptor">Hinge constraing.</add>
+        Bethesda extension of hkpHingeConstraintData. A basic hinge with no angular limits or motor.
+        <add name="Constraint" type="bhkHingeConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkBallAndSocketConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
-        A Ball and Socket Constraint.
-        <add name="Ball and Socket" type="BallAndSocketDescriptor">Describes a ball and socket constraint</add>
+        Bethesda extension of hkpBallAndSocketConstraintData.
+        Point-to-point constraint that attempts to keep the pivot point of two bodies in the same space.
+        <add name="Constraint" type="bhkBallAndSocketConstraintCInfo" />
     </niobject>
 
-    <compound name="ConstraintInfo" size="32" versions="#BETHESDA#">
-        Two Vector4 for pivot in A and B.
-        <add name="Pivot In A" type="Vector4" />
-        <add name="Pivot In B" type="Vector4" />
-    </compound>
-
     <niobject name="bhkBallSocketConstraintChain" inherit="bhkSerializable" versions="#BETHESDA#">
-        A Ball and Socket Constraint chain.
-        <add name="Num Pivots" type="uint">Number of pivot points. Divide by 2 to get the number of constraints.</add>
-        <add name="Pivots" type="ConstraintInfo" arr1="Num Pivots / 2">Two pivot points A and B for each constraint.</add>
+        Bethesda extension of hkpBallSocketChainData. A chain of ball and socket constraints.
+        <add name="Num Pivots" type="uint" calc="#LEN[Pivots]# * 2">Should equal (Num Chained Entities - 1) * 2</add>
+        <add name="Pivots" type="bhkBallAndSocketConstraintCInfo" arr1="Num Pivots / 2">Two pivot points A and B for each constraint.</add>
         <add name="Tau" type="float" default="1.0">High values are harder and more reactive, lower values are smoother.</add>
         <add name="Damping" type="float" default="0.6">Defines damping strength for the current velocity.</add>
         <add name="Constraint Force Mixing" type="float" default="1.1920929e-08">Restitution (amount of elasticity) of constraints. Added to the diagonal of the constraint matrix. A value of 0.0 can result in a division by zero with some chain configurations.</add>
         <add name="Max Error Distance" type="float" default="0.1">Maximum distance error in constraints allowed before stabilization algorithm kicks in. A smaller distance causes more resistance.</add>
-        <add name="Num Entities A" type="uint">Number of links in the chain</add>
-        <add name="Entities A" type="Ptr" template="bhkRigidBody" arr1="Num Entities A" />
-        <add name="Num Entities" type="uint" default="2">Hardcoded to 2. Don't change.</add>
-        <add name="Entity A" type="Ptr" template="bhkRigidBody" />
-        <add name="Entity B" type="Ptr" template="bhkRigidBody" />
-        <add name="Priority" type="uint" default="1" />
+        <add name="Constraint Chain Info" type="bhkConstraintChainCInfo" />
     </niobject>
 
     <niobject name="bhkShape" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
@@ -2791,11 +2851,11 @@
     </niobject>
 
     <niobject name="bhkTransformShape" inherit="bhkShape" versions="#BETHESDA#">
-        Contains an bhkShape and an additional transform for that shape.
+        Contains a bhkShape and an additional transform for that shape.
         <add name="Shape" type="Ref" template="bhkShape">The shape that this object transforms.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float" />
-        <add name="Unused" type="byte" arr1="8" binary="true">Garbage data from memory.</add>
+        <add name="Unused 01" type="byte" arr1="8" binary="true" />
         <add name="Transform" type="Matrix44">A transform matrix.</add>
     </niobject>
 
@@ -2820,7 +2880,7 @@
 
     <niobject name="bhkPlaneShape" inherit="bhkHeightFieldShape" versions="#BETHESDA#">
         Contains a normal and distance from the origin, bounded by a given AABB.
-        <add name="Unused" type="byte" arr1="12" binary="true">Not used. The following wants to be aligned at 16 bytes.</add>
+        <add name="Unused 01" type="byte" arr1="12" binary="true" />
         <add name="Plane Normal" type="Vector3" />
         <add name="Plane Constant" type="float">Distance from the origin to the plane.</add>
         <add name="AABB Half Extents" type="Vector4" />
@@ -2833,16 +2893,16 @@
 
     <niobject name="bhkCylinderShape" inherit="bhkConvexShape" versions="#BETHESDA#">
         A cylinder.
-        <add name="Unused" type="byte" arr1="8" binary="true">Not used. The following wants to be aligned at 16 bytes.</add>
+        <add name="Unused 01" type="byte" arr1="8" binary="true" />
         <add name="Vertex A" type="Vector4" />
         <add name="Vertex B" type="Vector4" />
         <add name="Cylinder Radius" type="float" />
-        <add name="Unused 2" type="byte" arr1="12" binary="true">Not used. The block is padded to 16 bytes.</add>
+        <add name="Unused 02" type="byte" arr1="12" binary="true" />
     </niobject>
 
     <niobject name="bhkCapsuleShape" inherit="bhkConvexShape" versions="#BETHESDA#">
         A capsule.
-        <add name="Unused" type="byte" arr1="8" binary="true">Not used. The following wants to be aligned at 16 bytes.</add>
+        <add name="Unused 01" type="byte" arr1="8" binary="true" />
         <add name="First Point" type="Vector3">First point on the capsule's axis.</add>
         <add name="Radius 1" type="float">Matches first capsule radius.</add>
         <add name="Second Point" type="Vector3">Second point on the capsule's axis.</add>
@@ -2851,7 +2911,7 @@
 
     <niobject name="bhkBoxShape" inherit="bhkConvexShape" versions="#BETHESDA#">
         A box.
-        <add name="Unused" type="byte" arr1="8" binary="true">Not used. The following wants to be aligned at 16 bytes.</add>
+        <add name="Unused 01" type="byte" arr1="8" binary="true" />
         <add name="Dimensions" type="Vector3">A cube stored in Half Extents. A unit cube (1.0, 1.0, 1.0) would be stored as 0.5, 0.5, 0.5.</add>
         <add name="Unused Float" type="float">Unused as Havok stores the Half Extents as hkVector4 with the W component unused.</add>
     </niobject>
@@ -2860,8 +2920,8 @@
         A convex shape built from vertices. Note that if the shape is used in
         a non-static object (such as clutter), then they will simply fall
         through ground when they are under a bhkListShape.
-        <add name="Vertices Property" type="hkWorldObjCinfoProperty" />
-        <add name="Normals Property" type="hkWorldObjCinfoProperty" />
+        <add name="Vertices Property" type="bhkWorldObjCInfoProperty" />
+        <add name="Normals Property" type="bhkWorldObjCInfoProperty" />
         <add name="Num Vertices" type="uint">Number of vertices.</add>
         <add name="Vertices" type="Vector4" arr1="Num Vertices">Vertices. Fourth component is 0. Lexicographically sorted.</add>
         <add name="Num Normals" type="uint">The number of half spaces.</add>
@@ -2874,7 +2934,7 @@
         <add name="Shape" type="Ref" template="bhkConvexShape">The shape that this object transforms.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float" />
-        <add name="Unused" type="byte" arr1="8" binary="true">Garbage data from memory.</add>
+        <add name="Unused 01" type="byte" arr1="8" binary="true" />
         <add name="Transform" type="Matrix44">A transform matrix.</add>
     </niobject>
 
@@ -2890,26 +2950,33 @@
         However, if two bhkMultiSphereShape collide, every sphere needs to be checked against every other sphere.
             Example: 10 spheres colliding with 10 spheres will result in 100 collision checks.
             Therefore shapes like bhkCapsuleShape or bhkConvexVerticesShape should be preferred.
-        <add name="Shape Property" type="hkWorldObjCinfoProperty" />
+        <add name="Shape Property" type="bhkWorldObjCInfoProperty" />
         <add name="Num Spheres" type="uint" calc="(#LEN[Spheres]# #LT# 8) #THEN# #LEN[Spheres]# #ELSE# 8" />
         <add name="Spheres" type="NiBound" arr1="Num Spheres">The spheres which make up the multi sphere shape. Max of 8.</add>
     </niobject>
 
     <niobject name="bhkBvTreeShape" abstract="true" inherit="bhkShape" versions="#BETHESDA#">
-        Adds bounding volume tree information to an shape collection.
+        Bethesda extension of hkpBvTreeShape. hkpBvTreeShape adds a bounding volume tree to an hkpShapeCollection.
         A bounding volume tree is useful for testing collision between a moving object and large static geometry.
+        <add name="Shape" type="Ref" template="bhkShape">The shape.</add>
     </niobject>
 
+    <compound name="hkpMoppCode" versions="#BETHESDA#">
+        <add name="Data Size" type="uint">Number of bytes for MOPP data.</add>
+        <add name="Offset" type="Vector4" ver1="10.1.0.0">
+            XYZ: Origin of the object in mopp coordinates. This is the minimum of all vertices in the packed shape along each axis, minus 0.1.
+            W: The scaling factor to quantize the MOPP: the quantization factor is equal to 256*256 divided by this number.
+               In Oblivion files, scale is taken equal to 256*256*254 / (size + 0.2) where size is the largest dimension of the bounding box of the packed shape.
+        </add>
+        <add name="Build Type" type="hkMoppCodeBuildType" vercond="#BS_GT_FO3#">Tells if MOPP Data was organized into smaller chunks (PS3) or not (PC)</add>
+        <add name="Data" type="byte" binary="true" arr1="Data Size">The tree of bounding volume data.</add>
+    </compound>
+
     <niobject name="bhkMoppBvTreeShape" inherit="bhkBvTreeShape" versions="#BETHESDA#">
-        Memory optimized partial polytope bounding volume tree shape (not an entity).
-        <add name="Shape" type="Ref" template="bhkShape">The shape.</add>
-        <add name="Unused" type="uint" arr1="3">Garbage data from memory. Referred to as User Data, Shape Collection, and Code.</add>
-        <add name="Shape Scale" type="float" default="1.0">Scale.</add>
-        <add name="MOPP Data Size" type="uint">Number of bytes for MOPP data.</add>
-        <add name="Origin" type="Vector3" ver1="10.1.0.0">Origin of the object in mopp coordinates. This is the minimum of all vertices in the packed shape along each axis, minus 0.1.</add>
-        <add name="Scale" type="float" ver1="10.1.0.0">The scaling factor to quantize the MOPP: the quantization factor is equal to 256*256 divided by this number. In Oblivion files, scale is taken equal to 256*256*254 / (size + 0.2) where size is the largest dimension of the bounding box of the packed shape.</add>
-        <add name="Build Type" type="MoppDataBuildType" vercond="#BS_GT_FO3#">Tells if MOPP Data was organized into smaller chunks (PS3) or not (PC)</add>
-        <add name="MOPP Data" type="byte" binary="true" arr1="MOPP Data Size">The tree of bounding volume data.</add>
+        Bethesda extension of hkpMoppBvTreeShape. hkpMoppBvTreeShape is a bounding volume tree using Havok-proprietary MOPP code.
+        <add name="Unused 01" type="byte" arr1="12" binary="true" />
+        <add name="Scale" type="float" default="1.0" />
+        <add name="MOPP Code" type="hkpMoppCode" />
     </niobject>
 
 
@@ -2920,43 +2987,39 @@
     <niobject name="bhkListShape" inherit="bhkShapeCollection" versions="#BETHESDA#">
         A list of shapes.
 
-        Do not put a bhkPackedNiTriStripsShape in the Sub Shapes. Use a
-        separate collision nodes without a list shape for those.
-
-        Also, shapes collected in a bhkListShape may not have the correct
-        walking noise, so only use it for non-walkable objects.
+        Shapes collected in a bhkListShape may not have the correct collision sound/FX due to HavokMaterial issues.
+        Do not put a bhkPackedNiTriStripsShape in the Sub Shapes. Use a separate collision nodes without a list shape for those.
         <add name="Num Sub Shapes" type="uint" default="1" calc="(#LEN[Sub Shapes]# #LT# 256) #THEN# #LEN[Sub Shapes]# #ELSE# 256" />
         <add name="Sub Shapes" type="Ref" template="bhkShape" arr1="Num Sub Shapes">List of shapes. Max of 256.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
-        <add name="Child Shape Property" type="hkWorldObjCinfoProperty" />
-        <add name="Child Filter Property" type="hkWorldObjCinfoProperty" />
-        <add name="Num Unknown Ints" type="uint" calc="#LEN[Sub Shapes]#" />
-        <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" />
+        <add name="Child Shape Property" type="bhkWorldObjCInfoProperty" />
+        <add name="Child Filter Property" type="bhkWorldObjCInfoProperty" />
+        <add name="Num Filters" type="uint" calc="#LEN[Sub Shapes]#" />
+        <add name="Filters" type="HavokFilter" arr1="Num Filters">Always zeroed. Seemingly unused, or 0 for all values means no override.</add>
     </niobject>
 
     <niobject name="bhkMeshShape" inherit="bhkShape" versions="V10_0_1_0">
-        bhkMeshShape appears in some old Oblivion nifs, for instance
-        meshes/architecture/basementsections/ungrdltraphingedoor.nif 
-        but only in some distributions of Oblivion
-        <add name="Unknowns" type="uint" arr1="2" />
+        Bethesda extension of hkpMeshShape, but using NiTriStripsData instead of Havok storage.
+        Appears in one old Oblivion NIF, but only in certain distributions. NIF version 10.0.1.0 only.
+        <add name="Unknown 01" type="uint" arr1="2" />
         <add name="Radius" type="float" />
-        <add name="Unused 2" type="byte" arr1="8" binary="true" />
+        <add name="Unknown 02" type="uint" arr1="2" />
         <add name="Scale" type="Vector4" />
         <add name="Num Shape Properties" type="uint" />
-        <add name="Shape Properties" type="hkWorldObjCinfoProperty" arr1="Num Shape Properties" />
-        <add name="Unknown 2" type="int" arr1="3" />
-        <add name="Num Strips Data" type="uint" ver2="10.0.1.0">The number of strips data objects referenced.</add>
-        <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data" ver2="10.0.1.0">Refers to a bunch of NiTriStripsData objects that make up this shape.</add>
+        <add name="Shape Properties" type="bhkWorldObjCInfoProperty" arr1="Num Shape Properties" />
+        <add name="Unknown 03" type="uint" arr1="3" />
+        <add name="Num Strips Data" type="uint" ver2="10.0.1.0" />
+        <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data" ver2="10.0.1.0" />
     </niobject>
 
     <niobject name="bhkPackedNiTriStripsShape" inherit="bhkShapeCollection" versions="#BETHESDA#">
-        A shape constructed from strips data.
+        Bethesda custom hkpShapeCollection using custom packed tri strips data.
         <add name="Num Sub Shapes" type="ushort" ver2="20.0.0.5" />
-        <add name="Sub Shapes" type="OblivionSubShape" arr1="Num Sub Shapes" ver2="20.0.0.5" />
+        <add name="Sub Shapes" type="hkSubPartData" arr1="Num Sub Shapes" ver2="20.0.0.5" />
         <add name="User Data" type="uint" default="0" />
-        <add name="Unused 1" type="uint">Looks like a memory pointer and may be garbage.</add>
+        <add name="Unused 01" type="byte" arr1="4" binary="true" />
         <add name="Radius" type="float" default="0.1" />
-        <add name="Unused 2" type="uint">Looks like a memory pointer and may be garbage.</add>
+        <add name="Unused 02" type="byte" arr1="4" binary="true" />
         <add name="Scale" type="Vector4" default="#VEC4_1110#" />
         <add name="Radius Copy" type="float" default="0.1">Same as radius</add>
         <add name="Scale Copy" type="Vector4" default="#VEC4_1110#">Same as scale.</add>
@@ -2964,16 +3027,16 @@
     </niobject>
 
     <niobject name="bhkNiTriStripsShape" inherit="bhkShapeCollection" versions="#BETHESDA#">
-        A shape constructed from a bunch of strips.
+        Bethesda custom hkpShapeCollection using NiTriStripsData for geometry storage.
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float" default="0.1" />
-        <add name="Unused" type="uint" arr1="5">Garbage data from memory though the last 3 are referred to as maxSize, size, and eSize.</add>
+        <add name="Unused 01" type="byte" arr1="20" binary="true" />
         <add name="Grow By" type="uint" default="1" />
-        <add name="Scale" type="Vector4" default="#VEC4_1110#" ver1="10.1.0.0">Scale. Usually (1.0, 1.0, 1.0, 0.0).</add>
-        <add name="Num Strips Data" type="uint" default="1">The number of strips data objects referenced.</add>
-        <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data">Refers to a bunch of NiTriStripsData objects that make up this shape.</add>
-        <add name="Num Data Layers" type="uint" default="1" calc="#LEN[Strips Data]#" />
-        <add name="Data Layers" type="HavokFilter" arr1="Num Data Layers">Havok Layers for each strip data.</add>
+        <add name="Scale" type="Vector4" default="#VEC4_1110#" ver1="10.1.0.0" />
+        <add name="Num Strips Data" type="uint" default="1" />
+        <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data" />
+        <add name="Num Filters" type="uint" default="1" calc="#LEN[Strips Data]#" />
+        <add name="Filters" type="HavokFilter" arr1="Num Filters" />
     </niobject>
 
     <niobject name="NiExtraData" inherit="NiObject">
@@ -3611,15 +3674,18 @@
         <add name="Strength" type="float" default="0.25">The amount of force wind will have on particles.</add>
     </niobject>
 
-    <niobject name="hkPackedNiTriStripsData" inherit="bhkShapeCollection">
-        NiTriStripsData for havok data?
+    <niobject name="hkPackedNiTriStripsData" inherit="bhkShapeCollection" versions="#BETHESDA#">
+        Bethesda custom tri strips data block for bhkPackedNiTriStripsShape.
         <add name="Num Triangles" type="uint" />
         <add name="Triangles" type="TriangleData" arr1="Num Triangles" />
         <add name="Num Vertices" type="uint" />
-        <add name="Unknown Byte 1" type="byte" ver1="20.2.0.7" />
-        <add name="Vertices" type="Vector3" arr1="Num Vertices" />
-        <add name="Num Sub Shapes" type="ushort" ver1="20.2.0.7">Number of subparts.</add>
-        <add name="Sub Shapes" type="OblivionSubShape" arr1="Num Sub Shapes" ver1="20.2.0.7">The subparts.</add>
+        <add name="Compressed" type="bool" ver1="20.2.0.7" />
+        <add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Compressed == 0" />
+        <add name="Compressed Vertices" type="HalfVector3" arr1="Num Vertices" cond="Compressed != 0">
+            Compression on read may not be supported. Vertices may be packed in ushort that are not IEEE standard half-precision.
+        </add>
+        <add name="Num Sub Shapes" type="ushort" ver1="20.2.0.7" />
+        <add name="Sub Shapes" type="hkSubPartData" arr1="Num Sub Shapes" ver1="20.2.0.7" />
     </niobject>
 
     <niobject name="NiAlphaProperty" inherit="NiProperty">
@@ -6335,7 +6401,7 @@
         <add name="Radius" type="float" />
         <add name="Unknown Int 1" type="uint" />
         <add name="Unknown Float 1" type="float" />
-        <add name="Child Shape Property" type="hkWorldObjCinfoProperty" />
+        <add name="Child Shape Property" type="bhkWorldObjCInfoProperty" />
         <add name="Use Cached AABB" type="bool">If true, an AABB of the children's AABBs is used, which is faster but larger than building an AABB from each child.</add>
         <add name="Closest Point Min Distance" type="float">A distance which is used for getClosestPoint(). If the object being tested is closer, the children are recursed. Otherwise it returns this value.</add>
     </niobject>
@@ -6376,11 +6442,9 @@
         <add name="Anim Notes" type="Ref" template="BSAnimNote" arr1="Num Anim Notes">BSAnimNote objects.</add>
     </niobject>
 
-    <niobject name="bhkLiquidAction" inherit="bhkSerializable" versions="#FO3_AND_LATER#">
-        Bethesda-specific Havok serializable.
-        <add name="User Data" type="uint" />
-        <add name="Unknown Int 2" type="int" />
-        <add name="Unknown Int 3" type="int" />
+    <niobject name="bhkLiquidAction" inherit="bhkAction" versions="#FO3_AND_LATER#">
+        Bethesda custom bhkUnaryAction. Does not hold a link to the body like other bhkUnaryActions however.
+        <add name="Unused 01" type="byte" arr1="12" binary="true" />
         <add name="Initial Stick Force" type="float" />
         <add name="Stick Strength" type="float" />
         <add name="Neighbor Distance" type="float" />
@@ -6506,13 +6570,6 @@
         <add name="Items" type="int" arr1="Num Items" />
     </niobject>
 
-    <niobject name="bhkAabbPhantom" inherit="bhkShapePhantom" versions="#BETHESDA#">
-        Bethesda-specific Havok serializable.
-        <add name="Unused Bytes 3" type="byte" arr1="8" binary="true" />
-        <add name="AABB Min" type="Vector4" />
-        <add name="AABB Max" type="Vector4" />
-    </niobject>
-
     <niobject name="BSFrustumFOVController" inherit="NiFloatInterpController" versions="#BETHESDA#">
         Bethesda-specific time controller.
     </niobject>
@@ -6522,23 +6579,21 @@
     </niobject>
 
     <niobject name="bhkBreakableConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
-        A breakable constraint.
-        <add name="Constraint Data" type="ConstraintData">Constraint within constraint.</add>
-        <add name="Threshold" type="float">Amount of force to break the rigid bodies apart?</add>
+        Bethesda extension of hkpBreakableConstraintData, a wrapper around hkpConstraintInstance.
+        The constraint can "break" i.e. stop applying the forces to each body to keep them constrained.
+        <add name="Constraint Data" type="bhkWrappedConstraintData">The wrapped constraint.</add>
+        <add name="Threshold" type="float">The larger the value, the harder to "break" the constraint.</add>
         <add name="Remove When Broken" type="bool" default="0">No: Constraint stays active. Yes: Constraint gets removed when breaking threshold is exceeded.</add>
     </niobject>
 
-    <niobject name="bhkOrientHingedBodyAction" inherit="bhkSerializable" versions="#BETHESDA#">
-        Bethesda-Specific Havok serializable.
-        <add name="Body" type="Ptr" template="bhkRigidBody" />
-        <add name="Unknown Int 1" type="uint" />
-        <add name="Unknown Int 2" type="uint" />
-        <add name="Unused 1" type="byte" arr1="8" binary="true" />
-        <add name="Hinge Axis LS" type="Vector4" />
-        <add name="Forward LS" type="Vector4" />
-        <add name="Strength" type="float" />
-        <add name="Damping" type="float" />
-        <add name="Unused 2" type="byte" arr1="8" binary="true" />
+    <niobject name="bhkOrientHingedBodyAction" inherit="bhkUnaryAction" versions="#BETHESDA#">
+        Bethesda extension of hkpReorientAction (or similar). Will try to reorient a body to stay facing a given direction.
+        <add name="Unused 02" type="byte" arr1="8" binary="true" />
+        <add name="Hinge Axis LS" type="Vector4" default="#X_AXIS#" />
+        <add name="Forward LS" type="Vector4" default="#Y_AXIS#" />
+        <add name="Strength" type="float" default="1.0" />
+        <add name="Damping" type="float" default="0.1" />
+        <add name="Unused 03" type="byte" arr1="8" binary="true" />
     </niobject>
 
     <niobject name="bhkPoseArray" inherit="NiObject" versions="#FO3_AND_LATER#">
@@ -6566,7 +6621,7 @@
         <add name="Radius" type="float" default="1.0" />
         <add name="Material" type="HavokMaterial" />
         <add name="Num Constraints" type="uint" />
-        <add name="Constraint" type="ConstraintData" arr1="Num Constraints" />
+        <add name="Constraint" type="bhkWrappedConstraintData" arr1="Num Constraints" />
     </niobject>
 
     <compound name="Region" size="8" since="V20_5_0_0">
@@ -7581,14 +7636,16 @@
     </niobject>
 
     <enum name="hkWeldingType" storage="byte" prefix="WT">
+        hkpWeldingUtility::WeldingType
         <option value="0" name="ANTICLOCKWISE" />
         <!--<option value="4" name="CLOCKWISE" />-->
         <!--<option value="5" name="TWO_SIDED" />-->
         <!--<option value="6" name="NONE" />-->
     </enum>
 
-    <enum name="CMSDMatType" storage="byte" prefix="CMS">
-        <option value="1" name="SINGLE_VALUE_PER_CHUNK" />
+    <enum name="bhkCMSMatType" storage="byte" prefix="CMS">
+        hkpCompressedMeshShape::MaterialType
+        <option value="1" name="SINGLE_VALUE_PER_CHUNK">Chunk builder makes sure that only chunks with the same material are created.</option>
         <!--<option value="2" name="ONE_BYTE_PER_TRIANGLE" />-->
         <!--<option value="3" name="TWO_BYTES_PER_TRIANGLE" />-->
         <!--<option value="4" name="FOUR_BYTES_PER_TRIANGLE" />-->
@@ -7600,29 +7657,28 @@
 		<add name="Bits Per W Index" type="uint" default="18">Number of bits in the shape-key reserved for a triangle index and its winding</add>
 		<add name="Mask W Index" type="uint" default="0x3FFFF">Mask used to get the triangle index and winding from a shape-key/</add>
 		<add name="Mask Index" type="uint" default="0x1FFFF">Mask used to get the triangle index from a shape-key.</add>
-		<add name="Error" type="float" default="0.001">The radius of the storage mesh shape? Quantization error?</add>
-		<add name="Bounds Min" type="Vector4">The minimum boundary of the AABB (the coordinates of the corner with the lowest numerical values)</add>
-		<add name="Bounds Max" type="Vector4">The maximum boundary of the AABB (the coordinates of the corner with the highest numerical values)</add>
+		<add name="Error" type="float" default="0.001">Quantization error.</add>
+		<add name="AABB" type="hkAabb" />
 		<add name="Welding Type" type="hkWeldingType" default="ANTICLOCKWISE" />
-		<add name="Material Type" type="CMSDMatType" default="SINGLE_VALUE_PER_CHUNK" />
+		<add name="Material Type" type="bhkCMSMatType" default="SINGLE_VALUE_PER_CHUNK" />
 		<add name="Num Materials 32" type="uint" />
-		<add name="Materials 32" type="uint" arr1="Num Materials 32">Does not appear to be used.</add>
+		<add name="Materials 32" type="uint" arr1="Num Materials 32">Unused.</add>
 		<add name="Num Materials 16" type="uint" />
-		<add name="Materials 16" type="uint" arr1="Num Materials 16">Does not appear to be used.</add>
+		<add name="Materials 16" type="uint" arr1="Num Materials 16">Unused.</add>
 		<add name="Num Materials 8" type="uint" />
-		<add name="Materials 8" type="uint" arr1="Num Materials 8">Does not appear to be used.</add>
-		<add name="Num Materials" type="uint" default="1">Number of chunk materials</add>
-		<add name="Chunk Materials" type="bhkCMSDMaterial" arr1="Num Materials">Table (array) with sets of materials. Chunks refers to this table by index.</add>
-		<add name="Num Named Materials" type="uint" />
+		<add name="Materials 8" type="uint" arr1="Num Materials 8">Unused.</add>
+		<add name="Num Materials" type="uint" default="1" />
+		<add name="Chunk Materials" type="bhkMeshMaterial" arr1="Num Materials">Materials used by Chunks. Chunks refer to this table by index.</add>
+		<add name="Num Named Materials" type="uint">Number of hkpNamedMeshMaterial. Unused.</add>
 		<add name="Num Transforms" type="uint" default="1">Number of chunk transformations</add>
-        <add name="Chunk Transforms" type="bhkCMSDTransform" arr1="Num Transforms">Table (array) with sets of transformations. Chunks refers to this table by index.</add>
+        <add name="Chunk Transforms" type="bhkQsTransform" arr1="Num Transforms">Transforms used by Chunks. Chunks refer to this table by index.</add>
 		<add name="Num Big Verts" type="uint" />
-		<add name="Big Verts" type="Vector4" arr1="Num Big Verts">Compressed Vertices?</add>
+		<add name="Big Verts" type="Vector4" arr1="Num Big Verts">Vertices paired with Big Tris (triangles that are too large for chunks)</add>
         <add name="Num Big Tris" type="uint" />
-        <add name="Big Tris" type="bhkCMSDBigTris" arr1="Num Big Tris" />
+        <add name="Big Tris" type="bhkCMSBigTri" arr1="Num Big Tris">Triangles that are too large to fit in a chunk.</add>
         <add name="Num Chunks" type="uint" default="1" />
-        <add name="Chunks" type="bhkCMSDChunk" arr1="Num Chunks" />
-        <add name="Num Convex Piece A" type="uint">Does not appear to be used. Needs array.</add>
+        <add name="Chunks" type="bhkCMSChunk" arr1="Num Chunks" />
+        <add name="Num Convex Piece A" type="uint">Number of hkpCompressedMeshShape::ConvexPiece. Unused.</add>
 	</niobject>
 	
     <niobject name="BSInvMarker" inherit="NiExtraData" versions="#SKY_AND_LATER#">

From 2954bb4a534e88cd5d30a8058175b6e803cd7ca2 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Mon, 16 Jul 2018 00:03:01 -0400
Subject: [PATCH 65/86] BSVertexDesc correct bitfield

Made a correct bitfield using `uint64` as the underlying type, split into nibbles for the sizes and offsets of the vertex attributes.

Changed VertexFlags to VertexAttributes and it no longer has the empty nibble in front.

ARG passing of the BSVertexDesc is treated as the underlying numeric value of the bitfield, so that the attributes can be passed into BSVertexData using `#RSH# 44` instead of the member accessor syntax.

This makes the first use of the basic `uint64` type, so (de)serialization now requires support of 64-bit values.
---
 nif.xml | 124 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 64 insertions(+), 60 deletions(-)

diff --git a/nif.xml b/nif.xml
index 2a2b735..510a92c 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1916,68 +1916,72 @@
         <add name="v2" type="ushort">Second vertex index.</add>
         <add name="v3" type="ushort">Third vertex index.</add>
     </compound>
-	
-	<bitflags name="VertexFlags" storage="ushort" prefix="VF" versions="#SSE# #FO4#">
-		The two bytes of BSVertexDesc that describe the enabled vertex attributes.
-		The first 4 bits are skipped and the last bit is unused.
-		<option value="4" name="Vertex" />
-		<option value="5" name="UVs" />
-		<option value="6" name="UVs_2" />
-		<option value="7" name="Normals" />
-		<option value="8" name="Tangents" />
-		<option value="9" name="Vertex_Colors" />
-		<option value="10" name="Skinned" />
-		<option value="11" name="Land_Data" />
-		<option value="12" name="Eye_Data" />
-		<option value="13" name="Instance" />
-		<option value="14" name="Full_Precision" />
-	</bitflags>
-    
+
+    <bitflags name="VertexAttribute" storage="ushort" prefix="VF" versions="#SSE# #FO4#">
+        The bits of BSVertexDesc that describe the enabled vertex attributes.
+        <option value="1" name="Vertex" />
+        <option value="2" name="UVs" />
+        <option value="3" name="UVs_2" />
+        <option value="4" name="Normals" />
+        <option value="5" name="Tangents" />
+        <option value="6" name="Vertex_Colors" />
+        <option value="7" name="Skinned" />
+        <option value="8" name="Land_Data" />
+        <option value="9" name="Eye_Data" />
+        <option value="10" name="Instance" />
+        <option value="11" name="Full_Precision" />
+    </bitflags>
+
+    <bitfield name="BSVertexDesc" storage="uint64" versions="#SSE# #FO4#">
+        <member width="4" pos="0" mask="0xF" name="Vertex Data Size" type="uint" />
+        <member width="4" pos="4" mask="0xF0" name="Dynamic Vertex Size" type="uint" />
+        <member width="4" pos="8" mask="0xF00" name="UV1 Offset" type="uint" />
+        <member width="4" pos="12" mask="0xF000" name="UV2 Offset" type="uint" />
+        <member width="4" pos="16" mask="0xF0000" name="Normal Offset" type="uint" />
+        <member width="4" pos="20" mask="0xF00000" name="Tangent Offset" type="uint" />
+        <member width="4" pos="24" mask="0xF000000" name="Color Offset" type="uint" />
+        <member width="4" pos="28" mask="0xF0000000" name="Skinning Data Offset" type="uint" />
+        <member width="4" pos="32" mask="0xF00000000" name="Landscape Data Offset" type="uint" />
+        <member width="4" pos="36" mask="0xF000000000" name="Eye Data Offset" type="uint" />
+        <member width="4" pos="40" mask="0xF0000000000" name="Unused 01" type="uint" />
+        <member width="12" pos="44" mask="0xFFF00000000000" name="Vertex Attributes" type="VertexAttribute" />
+    </bitfield>
+
 	<compound name="BSVertexData" versions="#SSE# #FO4#">
-		<add name="Vertex" type="Vector3" cond="(#ARG# #BITAND# 0x4010) == 0x4010" />
-		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x4110) == 0x4110" />
-		<add name="Unknown Int" type="uint" cond="(#ARG# #BITAND# 0x4110) == 0x4010" />
-
-		<add name="Vertex" type="HalfVector3" cond="(#ARG# #BITAND# 0x4010) == 0x10" />
-		<add name="Bitangent X" type="hfloat" cond="(#ARG# #BITAND# 0x4110) == 0x110" />
-		<add name="Unknown Short" type="ushort" cond="(#ARG# #BITAND# 0x4110) == 0x10" />
-
-		<add name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x20" />
-		<add name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x80" />
-		<add name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x80" />
-		<add name="Tangent" type="ByteVector3" cond="(#ARG# #BITAND# 0x180) == 0x180" />
-		<add name="Bitangent Z" type="byte" cond="(#ARG# #BITAND# 0x180) == 0x180" />
-		<add name="Vertex Colors" type="ByteColor4" cond="#ARG# #BITAND# 0x200" />
-		<add name="Bone Weights" type="hfloat" arr1="4" cond="#ARG# #BITAND# 0x400" />
-		<add name="Bone Indices" type="byte" arr1="4" cond="#ARG# #BITAND# 0x400" />
-		<add name="Eye Data" type="float" cond="#ARG# #BITAND# 0x1000" />
+		<add name="Vertex" type="Vector3" cond="(#ARG# #BITAND# 0x401) == 0x401" />
+		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x411) == 0x411" />
+		<add name="Unknown Int" type="uint" cond="(#ARG# #BITAND# 0x411) == 0x401" />
+
+		<add name="Vertex" type="HalfVector3" cond="(#ARG# #BITAND# 0x401) == 0x1" />
+		<add name="Bitangent X" type="hfloat" cond="(#ARG# #BITAND# 0x411) == 0x11" />
+		<add name="Unknown Short" type="ushort" cond="(#ARG# #BITAND# 0x411) == 0x1" />
+
+		<add name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x2" />
+		<add name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x8" />
+		<add name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x8" />
+		<add name="Tangent" type="ByteVector3" cond="(#ARG# #BITAND# 0x18) == 0x18" />
+		<add name="Bitangent Z" type="byte" cond="(#ARG# #BITAND# 0x18) == 0x18" />
+		<add name="Vertex Colors" type="ByteColor4" cond="#ARG# #BITAND# 0x20" />
+		<add name="Bone Weights" type="hfloat" arr1="4" cond="#ARG# #BITAND# 0x40" />
+		<add name="Bone Indices" type="byte" arr1="4" cond="#ARG# #BITAND# 0x40" />
+		<add name="Eye Data" type="float" cond="#ARG# #BITAND# 0x100" />
 	</compound>
 
 	<compound name="BSVertexDataSSE" versions="#SSE# #FO4#">
-		<add name="Vertex" type="Vector3" cond="#ARG# #BITAND# 0x10" />
-		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x110) == 0x110" />
-		<add name="Unknown Int" type="int" cond="(#ARG# #BITAND# 0x110) == 0x10" />
-		<add name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x20" />
-		<add name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x80" />
-		<add name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x80" />
-		<add name="Tangent" type="ByteVector3" cond="(#ARG# #BITAND# 0x180) == 0x180" />
-		<add name="Bitangent Z" type="byte" cond="(#ARG# #BITAND# 0x180) == 0x180" />
-		<add name="Vertex Colors" type="ByteColor4" cond="#ARG# #BITAND# 0x200" />
-		<add name="Bone Weights" type="hfloat" arr1="4" cond="#ARG# #BITAND# 0x400" />
-		<add name="Bone Indices" type="byte" arr1="4" cond="#ARG# #BITAND# 0x400" />
-		<add name="Eye Data" type="float" cond="#ARG# #BITAND# 0x1000" />
+		<add name="Vertex" type="Vector3" cond="#ARG# #BITAND# 0x1" />
+		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x11) == 0x11" />
+		<add name="Unknown Int" type="int" cond="(#ARG# #BITAND# 0x11) == 0x1" />
+		<add name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x2" />
+		<add name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x8" />
+		<add name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x8" />
+		<add name="Tangent" type="ByteVector3" cond="(#ARG# #BITAND# 0x18) == 0x18" />
+		<add name="Bitangent Z" type="byte" cond="(#ARG# #BITAND# 0x18) == 0x18" />
+		<add name="Vertex Colors" type="ByteColor4" cond="#ARG# #BITAND# 0x20" />
+		<add name="Bone Weights" type="hfloat" arr1="4" cond="#ARG# #BITAND# 0x40" />
+		<add name="Bone Indices" type="byte" arr1="4" cond="#ARG# #BITAND# 0x40" />
+		<add name="Eye Data" type="float" cond="#ARG# #BITAND# 0x100" />
 	</compound>
 
-    <compound name="BSVertexDesc" size="8" versions="#SSE# #FO4#">
-        <add name="VF1" type="byte" />
-        <add name="VF2" type="byte" />
-        <add name="VF3" type="byte" />
-        <add name="VF4" type="byte" />
-        <add name="VF5" type="byte" />
-        <add name="Vertex Attributes" type="VertexFlags" />
-        <add name="VF8" type="byte" />
-    </compound>
-
     <compound name="SkinPartition" since="V4_2_1_0">
         Skinning data for a submesh, optimized for hardware skinning. Part of NiSkinPartition.
         <add name="Num Vertices" type="ushort">Number of vertices in this submesh.</add>
@@ -4814,7 +4818,7 @@
 		<add name="Data Size" type="uint" calc="#LEN[Vertex Data]# #MUL# Vertex Size" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Vertex Size" type="uint" calc="(Vertex Desc #BITAND# 0xF) #MUL# 4" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
-		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc\Vertex Attributes" arr1="Data Size / Vertex Size" cond="Data Size #GT# 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc #RSH# 44" arr1="Data Size / Vertex Size" cond="Data Size #GT# 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
 		<add name="Partitions" type="SkinPartition" arr1="Num Partitions" />
     </niobject>
 
@@ -7751,8 +7755,8 @@
         <add name="Num Triangles" type="ushort" vercond="#NI_BS_LT_FO4#" />
         <add name="Num Vertices" type="ushort" />
         <add name="Data Size" type="uint" calc="((Vertex Desc #BITAND# 0xF) #MUL# Num Vertices #MUL# 4) #ADD# (Num Triangles #MUL# 6)" />
-        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size #GT# 0" vercond="#BS_FO4#" />
-        <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc\Vertex Attributes" cond="Data Size #GT# 0" vercond="#BS_SSE#" />
+        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc #RSH# 44" cond="Data Size #GT# 0" vercond="#BS_FO4#" />
+        <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc #RSH# 44" cond="Data Size #GT# 0" vercond="#BS_SSE#" />
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size #GT# 0" />
         <add name="Particle Data Size" type="uint" calc="(Num Vertices #MUL# 6) #ADD# (Num Triangles #MUL# 3)" vercond="#BS_SSE#" />
         <add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
@@ -7907,7 +7911,7 @@
         <add name="Num Combined" type="uint" />
         <add name="Combined" type="BSPackedGeomDataCombined" arr1="Num Combined" />
         <add name="Vertex Desc" type="BSVertexDesc" />
-        <add name="Vertex Data" type="BSVertexData" arr1="Num Verts" arg="Vertex Desc\Vertex Attributes" />
+        <add name="Vertex Data" type="BSVertexData" arr1="Num Verts" arg="Vertex Desc #RSH# 44" />
         <add name="Triangles" type="Triangle" arr1="Tri Count LOD0 + Tri Count LOD1 + Tri Count LOD2" />
     </compound>
 

From b35b74b2358fd3ed09d042781c34b33c9c3203b7 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 19 Jul 2018 03:13:37 -0400
Subject: [PATCH 66/86] Rename `istemplate` to `generic`

Also use `true` instead of `1` to match other XML booleans.
---
 nif.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nif.xml b/nif.xml
index 510a92c..d6f1454 100644
--- a/nif.xml
+++ b/nif.xml
@@ -258,11 +258,11 @@
         A variable length string that ends with a newline character (0x0A).
     </basic>
 
-    <basic name="Ptr" integral="true" countable="false" istemplate="1" size="4">
+    <basic name="Ptr" integral="true" countable="false" generic="true" size="4">
         A signed 32-bit integer, referring to a object before this one in the hierarchy.  Examples:  Bones, gravity objects.
     </basic>
 
-    <basic name="Ref" integral="true" countable="false" istemplate="1" size="4">
+    <basic name="Ref" integral="true" countable="false" generic="true" size="4">
         A signed 32-bit integer, used to refer to another object; -1 means no reference. These should always point down the hierarchy. Other types are used for indexes that point to objects higher up.
     </basic>
 
@@ -1838,7 +1838,7 @@
         <add name="c" type="float">Continuity.</add>
     </compound>
 
-    <compound name="Key" istemplate="1">
+    <compound name="Key" generic="true">
         A generic key with support for interpolation. Type 1 is normal linear interpolation, type 2 has forward and backward tangents, and type 3 has tension, bias and continuity arguments. Note that color4 and byte always seem to be of type 1.
         <add name="Time" type="float">Time of the key.</add>
         <add name="Value" type="#T#">The key value.</add>
@@ -1847,14 +1847,14 @@
         <add name="TBC" type="TBC" cond="#ARG# == 3">The TBC of the key.</add>
     </compound>
 
-    <compound name="KeyGroup" istemplate="1">
+    <compound name="KeyGroup" generic="true">
         Array of vector keys (anything that can be interpolated, except rotations).
         <add name="Num Keys" type="uint">Number of keys in the array.</add>
         <add name="Interpolation" type="KeyType" cond="Num Keys != 0">The key type.</add>
         <add name="Keys" type="Key" arg="Interpolation" template="#T#" arr1="Num Keys">The keys.</add>
     </compound>
 
-    <compound name="QuatKey" istemplate="1">
+    <compound name="QuatKey" generic="true">
         A special version of the key type used for quaternions. Never has tangents. #T# should always be Quaternion.
         <add name="Time" type="float" ver2="10.1.0.0">Time the key applies.</add>
         <add name="Time" type="float" cond="#ARG# != 4" ver1="10.1.0.106">Time the key applies.</add>

From 97a81c8e501a31d3906fedca03b8ff89f1de3181 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 19 Jul 2018 03:20:50 -0400
Subject: [PATCH 67/86] Rename StringIndex to NiFixedString, add
 NiTFixedStringMap

The correct name for StringIndex is NiFixedString.  Also added NiTFixedStringMap which is used once in the NiPhysX module.
---
 nif.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/nif.xml b/nif.xml
index d6f1454..9596846 100644
--- a/nif.xml
+++ b/nif.xml
@@ -270,7 +270,7 @@
         A 32-bit unsigned integer, used to refer to strings in a NiStringPalette.
     </basic>
 
-    <basic name="StringIndex" integral="true" countable="false" size="4">
+    <basic name="NiFixedString" integral="true" countable="false" size="4">
         A 32-bit unsigned integer, used to refer to strings in the header.
     </basic>
     
@@ -1529,7 +1529,20 @@
     <compound name="string">
         A string type.
         <add name="String" type="SizedString" ver2="20.0.0.5">The normal string.</add>
-        <add name="Index" type="StringIndex" ver1="20.1.0.3">The string index.</add>
+        <add name="Index" type="NiFixedString" ver1="20.1.0.3">The string index.</add>
+    </compound>
+
+    <compound name="NiTFixedStringMapItem" generic="true">
+        Currently, #T# must be a basic type due to nif.xml restrictions.
+        <add name="String" type="NiFixedString" />
+        <add name="Value" type="#T#" />
+    </compound>
+
+    <compound name="NiTFixedStringMap" generic="true">
+        A mapping or hash table between NiFixedString keys and a generic value.
+        Currently, #T# must be a basic type due to nif.xml restrictions.
+        <add name="Num Strings" type="uint" />
+        <add name="Strings" type="NiTFixedStringMapItem" template="#T#" arr1="Num Strings" />
     </compound>
 
     <compound name="ByteArray">
@@ -1578,7 +1591,7 @@
     <compound name="FilePath">
         A string that contains the path to a file.
         <add name="String" type="SizedString" ver2="20.0.0.5">The normal string.</add>
-        <add name="Index" type="StringIndex" ver1="20.1.0.3">The string index.</add>
+        <add name="Index" type="NiFixedString" ver1="20.1.0.3">The string index.</add>
     </compound>
 
     <compound name="Footer">

From 6091a899bb5842b89dbeeb8c9bf7a35b90aa06ba Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 24 Jul 2018 19:07:57 -0400
Subject: [PATCH 68/86] Default Values Pass 2

Second default values pass, plus some general changes to accommodate them.
---
 nif.xml | 511 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 303 insertions(+), 208 deletions(-)

diff --git a/nif.xml b/nif.xml
index 9596846..b442fec 100644
--- a/nif.xml
+++ b/nif.xml
@@ -132,6 +132,8 @@
         <default token="#VEC2_ONE#" string="1.0, 1.0" />
         <default token="#VEC3_ONE#" string="1.0, 1.0, 1.0" />
         <default token="#VEC3_ZERO#" string="0.0, 0.0, 0.0" />
+        <default token="#VEC4_ONE#" string="1.0, 1.0, 1.0, 1.0" />
+        <default token="#VEC4_ZERO#" string="0.0, 0.0, 0.0, 0.0" />
         <default token="#VEC4_1110#" string="1.0, 1.0, 1.0, 0.0" />
         <default token="#X_AXIS#" string="1.0, 0.0, 0.0" />
         <default token="#Y_AXIS#" string="0.0, 1.0, 0.0" />
@@ -3944,7 +3946,7 @@
         <add name="DIV2 Ints" type="int" arr1="Num DIV2 Ints" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
         <add name="DIV2 Ref" type="Ref" template="NiObject" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
         <add name="Num Controlled Blocks" type="uint" />
-        <add name="Array Grow By" type="uint" ver1="10.1.0.106" />
+        <add name="Array Grow By" type="uint" default="1" ver1="10.1.0.106" />
         <add name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" />
     </niobject>
 
@@ -4013,7 +4015,7 @@
         NiFogProperty allows the application to enable, disable and control the appearance of fog.
         <add name="Flags" type="FogFlags" />
         <add name="Fog Depth" type="float" default="1.0">Depth of the fog in normalized units. 1.0 = begins at near plane. 0.5 = begins halfway between the near and far planes.</add>
-        <add name="Fog Color" type="Color3">The color of the fog.</add>
+        <add name="Fog Color" type="Color3" default="#VEC3_ZERO#">The color of the fog.</add>
     </niobject>
 
     <niobject name="NiGravity" inherit="NiParticleModifier" until="V10_0_1_0">
@@ -4194,7 +4196,7 @@
 
     <niobject name="NiSwitchNode" inherit="NiNode">
         Represents groups of multiple scenegraph subtrees, only one of which (the "active child") is drawn at any given time.
-        <add name="Switch Node Flags" type="NiSwitchFlags" ver1="10.1.0.0" />
+        <add name="Switch Node Flags" type="NiSwitchFlags" default="3" ver1="10.1.0.0" />
         <add name="Index" type="uint" />
     </niobject>
 
@@ -4912,7 +4914,7 @@
 
     <niobject name="NiStringsExtraData" inherit="NiExtraData">
         List of strings; for example, a list of all bone names.
-        <add name="Num Strings" type="uint">Number of strings.</add>
+        <add name="Num Strings" type="uint" default="1">Number of strings.</add>
         <add name="Data" type="SizedString" arr1="Num Strings">The strings.</add>
     </niobject>
 
@@ -5198,7 +5200,7 @@
     <niobject name="NiPhysXScene" inherit="NiObjectNET" since="V20_2_0_8">
         Object which manages a NxScene object and the Gamebryo objects that interact with it.
         <add name="Scene Transform" type="NiTransform" />
-        <add name="PhysX to World Scale" type="float" />
+        <add name="PhysX to World Scale" type="float" default="1.0" />
         <add name="Num Props" type="uint" ver1="20.3.0.2" />
         <add name="Props" type="Ref" template="NiPhysXProp" arr1="Num Props" ver1="20.3.0.2" />
         <add name="Num Sources" type="uint" />
@@ -5207,84 +5209,130 @@
         <add name="Dests" type="Ref" template="NiPhysXDest" arr1="Num Dests" />
         <add name="Num Modified Meshes" type="uint" ver1="20.4.0.0" />
         <add name="Modified Meshes" type="Ref" template="NiMesh" arr1="Num Modified Meshes" ver1="20.4.0.0" />
-        <add name="Time Step" type="float" ver1="20.2.0.8" />
+        <add name="Time Step" type="float" default="0.016666" ver1="20.2.0.8" />
         <add name="Keep Meshes" type="bool" ver1="20.2.0.8" ver2="20.3.0.1" />
-        <add name="Num Sub Steps" type="uint" ver1="20.3.0.9" />
-        <add name="Max Sub Steps" type="uint" ver1="20.3.0.9" />
+        <add name="Num Sub Steps" type="uint" default="1" ver1="20.3.0.9" />
+        <add name="Max Sub Steps" type="uint" default="8" ver1="20.3.0.9" />
         <add name="Snapshot" type="Ref" template="NiPhysXSceneDesc" />
         <add name="Flags" type="ushort" />
     </niobject>
 
-    <enum name="NiSceneDescNxBroadPhaseType" storage="uint" since="V20_2_0_8">
-        <option name="NX_BROADPHASE_QUADRATIC" value="0" />
-        <option name="NX_BROADPHASE_FULL" value="1" />
-        <option name="NX_BROADPHASE_COHERENT" value="2" />
+    <enum name="NiSceneDescNxBroadPhaseType" storage="uint" prefix="NX" since="V20_2_0_8">
+        <option value="0" name="BROADPHASE_QUADRATIC" />
+        <option value="1" name="BROADPHASE_FULL" />
+        <option value="2" name="BROADPHASE_COHERENT" />
     </enum>
 
-    <enum name="NiSceneDescNxHwPipelineSpec" storage="uint" since="V20_2_0_8">
-        <option name="NX_HW_RB_PIPELINE_HLP_ONLY" value="0" />
-        <option name="NX_HW_PIPELINE_FULL" value="1" />
-        <option name="NX_HW_PIPELINE_DEBUG" value="2" />
+    <enum name="NiSceneDescNxHwPipelineSpec" storage="uint" prefix="NX_HW" since="V20_2_0_8">
+        <option value="0" name="RB_PIPELINE_HLP_ONLY" />
+        <option value="1" name="PIPELINE_FULL" />
+        <option value="2" name="PIPELINE_DEBUG" />
     </enum>
 
-    <enum name="NiSceneDescNxHwSceneType" storage="uint" since="V20_2_0_8">
-        <option name="NX_HW_SCENE_TYPE_RB" value="0" />
-        <option name="NX_HW_SCENE_TYPE_FLUID" value="1" />
-        <option name="NX_HW_SCENE_TYPE_FLUID_SOFTWARE" value="2" />
-        <option name="NX_HW_SCENE_TYPE_CLOTH" value="3" />
+    <enum name="NiSceneDescNxHwSceneType" storage="uint" prefix="NX_HW" since="V20_2_0_8">
+        <option value="0" name="SCENE_TYPE_RB" />
+        <option value="1" name="SCENE_TYPE_FLUID" />
+        <option value="2" name="SCENE_TYPE_FLUID_SOFTWARE" />
+        <option value="3" name="SCENE_TYPE_CLOTH" />
     </enum>
 
-    <enum name="NxTimeStepMethod" storage="uint" since="V20_2_0_8">
-        <option name="NX_TIMESTEP_FIXED" value="0" />
-        <option name="NX_TIMESTEP_VARIABLE" value="1" />
+    <enum name="NxTimeStepMethod" storage="uint" prefix="NX" since="V20_2_0_8">
+        <option value="0" name="TIMESTEP_FIXED" />
+        <option value="1" name="TIMESTEP_VARIABLE" />
+        <option value="2" name="TIMESTEP_INHERIT" />
     </enum>
 
-    <enum name="NxSimulationType" storage="uint" since="V20_2_0_8">
-        <option name="NX_SIMULATION_SW" value="0" />
-        <option name="NX_SIMULATION_HW" value="1" />
+    <enum name="NxSimulationType" storage="uint" prefix="NX" since="V20_2_0_8">
+        <option value="0" name="SIMULATION_SW" />
+        <option value="1" name="SIMULATION_HW" />
     </enum>
 
-    <enum name="NxBroadPhaseType" storage="uint" since="V20_2_0_8">
-        <option name="NX_BP_TYPE_SAP_SINGLE" value="0" />
-        <option name="NX_BP_TYPE_SAP_MULTI" value="1" />
+    <enum name="NxBroadPhaseType" storage="uint" prefix="NX" since="V20_2_0_8">
+        <option value="0" name="BP_TYPE_SAP_SINGLE" />
+        <option value="1" name="BP_TYPE_SAP_MULTI" />
     </enum>
 
-    <enum name="NxFilterOp" storage="uint" since="V20_2_0_8">
-        <option name="NX_FILTEROP_AND" value="0" />
-        <option name="NX_FILTEROP_OR" value="1" />
-        <option name="NX_FILTEROP_XOR" value="2" />
-        <option name="NX_FILTEROP_NAND" value="3" />
-        <option name="NX_FILTEROP_NOR" value="4" />
-        <option name="NX_FILTEROP_NXOR" value="5" />
-        <option name="NX_FILTEROP_SWAP_AND" value="6" />
+    <enum name="NxFilterOp" storage="uint" prefix="NX" since="V20_2_0_8">
+        <option value="0" name="FILTEROP_AND" />
+        <option value="1" name="FILTEROP_OR" />
+        <option value="2" name="FILTEROP_XOR" />
+        <option value="3" name="FILTEROP_NAND" />
+        <option value="4" name="FILTEROP_NOR" />
+        <option value="5" name="FILTEROP_NXOR" />
+        <option value="6" name="FILTEROP_SWAP_AND" />
     </enum>
 
-    <enum name="NxCompartmentType" storage="uint" since="V20_2_0_8">
-        <option name="NX_SCT_RIGIDBODY" value="0" />
-        <option name="NX_SCT_FLUID" value="1" />
-        <option name="NX_SCT_CLOTH" value="2" />
+    <enum name="NxThreadPriority" storage="uint" prefix="NX" since="V20_2_0_8">
+        <option value="0" name="TP_HIGH" />
+        <option value="1" name="TP_ABOVE_NORMAL" />
+        <option value="2" name="TP_NORMAL" />
+        <option value="3" name="TP_BELOW_NORMAL" />
+        <option value="4" name="TP_LOW" />
     </enum>
 
-    <compound name="PhysXSceneDescMaterial" size="6" since="V20_2_0_8">
+    <enum name="NxPruningStructure" storage="uint" prefix="NX" since="V20_2_0_8">
+        <option value="0" name="PRUNING_NONE" />
+        <option value="1" name="PRUNING_OCTREE" />
+        <option value="2" name="PRUNING_QUADTREE" />
+        <option value="3" name="PRUNING_DYNAMIC_AABB_TREE" />
+        <option value="4" name="PRUNING_STATIC_AABB_TREE" />
+    </enum>
+
+    <enum name="NxCompartmentType" storage="uint" prefix="NX" since="V20_2_0_8">
+        <option value="0" name="SCT_RIGIDBODY" />
+        <option value="1" name="SCT_FLUID" />
+        <option value="2" name="SCT_CLOTH" />
+    </enum>
+
+    <enum name="NxDeviceCode" storage="uint" prefix="NX_DC" since="V20_2_0_8">
+        <option value="0" name="PPU_0" />
+        <option value="1" name="PPU_1" />
+        <option value="2" name="PPU_2" />
+        <option value="3" name="PPU_3" />
+        <option value="4" name="PPU_4" />
+        <option value="5" name="PPU_5" />
+        <option value="6" name="PPU_6" />
+        <option value="7" name="PPU_7" />
+        <option value="8" name="PPU_8" />
+        <option value="4294901760" name="CPU" />
+        <option value="4294901761" name="PPU_AUTO_ASSIGN" />
+    </enum>
+
+    <bitflags name="NxBodyFlag" storage="uint" prefix="NX_BF" since="V20_2_0_8">
+        <option value="0" name="DISABLE_GRAVITY" />
+        <option value="1" name="FROZEN_POS_X" />
+        <option value="2" name="FROZEN_POS_Y" />
+        <option value="3" name="FROZEN_POS_Z" />
+        <option value="4" name="FROZEN_ROT_X" />
+        <option value="5" name="FROZEN_ROT_Y" />
+        <option value="6" name="FROZEN_ROT_Z" />
+        <option value="7" name="KINEMATIC" />
+        <option value="8" name="VISUALIZATION" />
+        <option value="9" name="POSE_SLEEP_TEST" />
+        <option value="10" name="FILTER_SLEEP_VEL" />
+        <option value="11" name="ENERGY_SLEEP_TEST" />
+    </bitflags>
+
+    <compound name="NiPhysXMaterialDescMap" size="6" since="V20_2_0_8">
         <add name="Key" type="ushort" />
         <add name="Material" type="Ref" template="NiPhysXMaterialDesc" />
     </compound>
 
-    <compound name="PhysXSceneDescCompartment" size="20" since="V20_2_0_8">
+    <compound name="NxCompartmentDescMap" size="20" since="V20_2_0_8">
         <add name="ID" type="uint" />
-        <add name="Type" type="NxCompartmentType" />
-        <add name="Device Code" type="uint" />
-        <add name="Grid Hash Cell Size" type="float" />
-        <add name="Grid Hash Table Power" type="uint" />
+        <add name="Type" type="NxCompartmentType" default="SCT_RIGIDBODY" />
+        <add name="Device Code" type="NxDeviceCode" default="CPU" />
+        <add name="Grid Hash Cell Size" type="float" default="100.0" />
+        <add name="Grid Hash Table Power" type="uint" default="8" />
     </compound>
 
     <niobject name="NiPhysXSceneDesc" inherit="NiObject" since="V20_2_0_8">
         Object which caches the properties of NxScene, stored as a snapshot in a NiPhysXScene.
         <add name="Broad Phase Type" type="NiSceneDescNxBroadPhaseType" ver2="20.2.0.7" />
         <add name="Gravity" type="Vector3" />
-        <add name="Max Timestep" type="float" />
-        <add name="Max Iterations" type="uint" />
-        <add name="Time Step Method" type="NxTimeStepMethod" />
+        <add name="Max Timestep" type="float" default="0.016666" />
+        <add name="Max Iterations" type="uint" default="8" />
+        <add name="Time Step Method" type="NxTimeStepMethod" default="TIMESTEP_FIXED" />
         <add name="Has Bound" type="bool" />
         <add name="Max Bounds Min" type="Vector3" cond="Has Bound" />
         <add name="Max Bounds Max" type="Vector3" cond="Has Bound" />
@@ -5293,7 +5341,7 @@
         <add name="Max Bodies" type="uint" cond="Has Limits" />
         <add name="Max Static Shapes" type="uint" cond="Has Limits" />
         <add name="Max Dynamic Shapes" type="uint" cond="Has Limits" />
-        <add name="Simulation Type" type="NxSimulationType" />
+        <add name="Simulation Type" type="NxSimulationType" default="SIMULATION_SW" />
         <add name="HW Scene Type" type="NiSceneDescNxHwSceneType" ver2="20.2.0.8" />
         <add name="HW Pipeline Spec" type="NiSceneDescNxHwPipelineSpec" ver2="20.2.0.8" />
         <add name="Ground Plane" type="bool" />
@@ -5307,13 +5355,13 @@
         <add name="Background Thread Mask" type="uint" ver1="20.2.0.8" />
         <add name="Num HW Scenes" type="uint" ver1="20.3.0.1" ver2="20.3.0.5" />
         <add name="Sim Thread Stack Size" type="uint" ver1="20.3.0.1" />
-        <add name="Sim Thread Priority" type="uint" ver1="20.3.0.1" />
+        <add name="Sim Thread Priority" type="NxThreadPriority" default="TP_NORMAL" ver1="20.3.0.1" />
         <add name="Worker Thread Stack Size" type="uint" ver1="20.3.0.1" />
-        <add name="Worker Thread Priority" type="uint" ver1="20.3.0.1" />
+        <add name="Worker Thread Priority" type="NxThreadPriority" default="TP_NORMAL" ver1="20.3.0.1" />
         <add name="Up Axis" type="uint" ver1="20.3.0.1" />
-        <add name="Subdivision Level" type="uint" ver1="20.3.0.1" />
-        <add name="Static Structure" type="uint" ver1="20.3.0.1" />
-        <add name="Dynamic Structure" type="uint" ver1="20.3.0.1" />
+        <add name="Subdivision Level" type="uint" default="5" ver1="20.3.0.1" />
+        <add name="Static Structure" type="NxPruningStructure" default="PRUNING_NONE" ver1="20.3.0.1" />
+        <add name="Dynamic Structure" type="NxPruningStructure" default="PRUNING_STATIC_AABB_TREE" ver1="20.3.0.1" />
         <add name="Dynamic Tree Rebuild Rate Hint" type="uint" ver1="20.5.0.3" />
         <add name="Broad Phase Type" type="NxBroadPhaseType" ver1="20.4.0.0" />
         <add name="Grid Cells X" type="uint" ver1="20.4.0.0" />
@@ -5323,19 +5371,19 @@
         <add name="Num Joints" type="uint" ver2="20.3.0.1" />
         <add name="Joints" type="Ref" template="NiPhysXJointDesc" arr1="Num Joints" ver2="20.3.0.1" />
         <add name="Num Materials" type="uint" ver2="20.3.0.1" />
-        <add name="Materials" type="PhysXSceneDescMaterial" arr1="Num Materials" ver2="20.3.0.1" />
+        <add name="Materials" type="NiPhysXMaterialDescMap" arr1="Num Materials" ver2="20.3.0.1" />
         <add name="Group Collision Flags" type="bool" arr1="1024" />
         <add name="Filter Ops" type="NxFilterOp" arr1="3" />
         <add name="Filter Constants" type="uint" arr1="8" />
-        <add name="Filter" type="bool" />
+        <add name="Filter" type="bool" default="1" />
         <add name="Num States" type="uint" ver2="20.3.0.1" />
         <add name="Num Compartments" type="uint" ver1="20.3.0.6" />
-        <add name="Compartments" type="PhysXSceneDescCompartment" arr1="Num Compartments" ver1="20.3.0.6" />
+        <add name="Compartments" type="NxCompartmentDescMap" arr1="Num Compartments" ver1="20.3.0.6" />
     </niobject>
 
     <niobject name="NiPhysXProp" inherit="NiObjectNET" since="V20_2_0_8">
         A PhysX prop which holds information about PhysX actors in a Gamebryo scene
-        <add name="PhysX to World Scale" type="float" />
+        <add name="PhysX to World Scale" type="float" default="1.0" />
         <add name="Num Sources" type="uint" />
         <add name="Sources" type="Ref" template="NiPhysXSrc" arr1="Num Sources" />
         <add name="Num Dests" type="uint" />
@@ -5344,19 +5392,9 @@
         <add name="Modified Meshes" type="Ref" template="NiMesh" arr1="Num Modified Meshes" ver1="20.4.0.0" />
         <add name="Temp Name" type="string" ver1="30.1.0.2" ver2="30.2.0.2" />
         <add name="Keep Meshes" type="bool" />
-        <add name="Prop Description" type="Ref" template="NiPhysXPropDesc" />
+        <add name="Snapshot" type="Ref" template="NiPhysXPropDesc" />
     </niobject>
 
-    <compound name="PhysXMaterialRef" size="6" since="V20_2_0_8">
-        <add name="Key" type="ushort" />
-        <add name="Material Desc" type="Ref" template="NiPhysXMaterialDesc" />
-    </compound>
-
-    <compound name="PhysXStateName" size="8" since="V20_2_0_8">
-        <add name="Name" type="string" />
-        <add name="Index" type="uint" />
-    </compound>
-
     <niobject name="NiPhysXPropDesc" inherit="NiObject" since="V20_2_0_8">
         For serialization of PhysX objects and to attach them to the scene.
         <add name="Num Actors" type="uint" />
@@ -5366,10 +5404,9 @@
         <add name="Num Clothes" type="uint" ver1="20.3.0.5" />
         <add name="Clothes" type="Ref" template="NiPhysXClothDesc" arr1="Num Clothes" ver1="20.3.0.5" />
         <add name="Num Materials" type="uint" />
-        <add name="Materials" type="PhysXMaterialRef" arr1="Num Materials" />
+        <add name="Materials" type="NiPhysXMaterialDescMap" arr1="Num Materials" />
         <add name="Num States" type="uint" />
-        <add name="Num State Names" type="uint" ver1="20.4.0.0" />
-        <add name="State Names" type="PhysXStateName" arr1="Num State Names" ver1="20.4.0.0" />
+        <add name="State Names" type="NiTFixedStringMap" template="uint" ver1="20.4.0.0" />
         <add name="Flags" type="byte" ver1="20.4.0.0" />
     </niobject>
 
@@ -5406,48 +5443,48 @@
         <add name="Mass" type="float" />
         <add name="Num Vels" type="uint" />
         <add name="Vels" type="PhysXBodyStoredVels" arr1="Num Vels" />
-        <add name="Wake Up Counter" type="float" />
+        <add name="Wake Up Counter" type="float" default="0.4" />
         <add name="Linear Damping" type="float" />
-        <add name="Angular Damping" type="float" />
-        <add name="Max Angular Velocity" type="float" />
+        <add name="Angular Damping" type="float" default="0.05" />
+        <add name="Max Angular Velocity" type="float" default="-1.0" />
         <add name="CCD Motion Threshold" type="float" />
-        <add name="Flags" type="uint" />
-        <add name="Sleep Linear Velocity" type="float" />
-        <add name="Sleep Angular Velocity" type="float" />
-        <add name="Solver Iteration Count" type="uint" />
-        <add name="Sleep Energy Threshold" type="float" ver1="20.3.0.0" />
+        <add name="Flags" type="NxBodyFlag" default="0x900" />
+        <add name="Sleep Linear Velocity" type="float" default="-1.0" />
+        <add name="Sleep Angular Velocity" type="float" default="-1.0" />
+        <add name="Solver Iteration Count" type="uint" default="4" />
+        <add name="Sleep Energy Threshold" type="float" default="-1.0" ver1="20.3.0.0" />
         <add name="Sleep Damping" type="float" ver1="20.3.0.0" />
-        <add name="Contact Report Threshold" type="float" ver1="20.4.0.0" />
-    </niobject>
-
-    <enum name="NxJointType" storage="uint" since="V20_2_0_8">
-        <option name="NX_JOINT_PRISMATIC" value="0" />
-        <option name="NX_JOINT_REVOLUTE" value="1" />
-        <option name="NX_JOINT_CYLINDRICAL" value="2" />
-        <option name="NX_JOINT_SPHERICAL" value="3" />
-        <option name="NX_JOINT_POINT_ON_LINE" value="4" />
-        <option name="NX_JOINT_POINT_IN_PLANE" value="5" />
-        <option name="NX_JOINT_DISTANCE" value="6" />
-        <option name="NX_JOINT_PULLEY" value="7" />
-        <option name="NX_JOINT_FIXED" value="8" />
-        <option name="NX_JOINT_D6" value="9" />
+        <add name="Contact Report Threshold" type="float" default="#FLT_MAX#" ver1="20.4.0.0" />
+    </niobject>
+
+    <enum name="NxJointType" storage="uint" prefix="NX_JOINT" since="V20_2_0_8">
+        <option value="0" name="PRISMATIC" />
+        <option value="1" name="REVOLUTE" />
+        <option value="2" name="CYLINDRICAL" />
+        <option value="3" name="SPHERICAL" />
+        <option value="4" name="POINT_ON_LINE" />
+        <option value="5" name="POINT_IN_PLANE" />
+        <option value="6" name="DISTANCE" />
+        <option value="7" name="PULLEY" />
+        <option value="8" name="FIXED" />
+        <option value="9" name="D6" />
     </enum>
 
-    <enum name="NxD6JointMotion" storage="uint" since="V20_2_0_8">
-        <option name="NX_D6JOINT_MOTION_LOCKED" value="0" />
-        <option name="NX_D6JOINT_MOTION_LIMITED" value="1" />
-        <option name="NX_D6JOINT_MOTION_FREE" value="2" />
+    <enum name="NxD6JointMotion" storage="uint" prefix="NX_D6JOINT" since="V20_2_0_8">
+        <option value="0" name="MOTION_LOCKED" />
+        <option value="1" name="MOTION_LIMITED" />
+        <option value="2" name="MOTION_FREE" />
     </enum>
 
-    <enum name="NxD6JointDriveType" storage="uint" since="V20_2_0_8">
-        <option name="NX_D6JOINT_DRIVE_POSITION" value="1" />
-        <option name="NX_D6JOINT_DRIVE_VELOCITY" value="2" />
+    <enum name="NxD6JointDriveType" storage="uint" prefix="NX_D6JOINT" since="V20_2_0_8">
+        <option value="1" name="DRIVE_POSITION" />
+        <option value="2" name="DRIVE_VELOCITY" />
     </enum>
 
-    <enum name="NxJointProjectionMode" storage="uint" since="V20_2_0_8">
-        <option name="NX_JPM_NONE" value="0" />
-        <option name="NX_JPM_POINT_MINDIST" value="1" />
-        <option name="NX_JPM_LINEAR_MINDIST" value="2" />
+    <enum name="NxJointProjectionMode" storage="uint" prefix="NX" since="V20_2_0_8">
+        <option value="0" name="JPM_NONE"/>
+        <option value="1" name="JPM_POINT_MINDIST" />
+        <option value="2" name="JPM_LINEAR_MINDIST" />
     </enum>
 
     <compound name="NiPhysXJointActor" size="40" since="V20_2_0_8">
@@ -5466,9 +5503,9 @@
 
     <compound name="NxJointDriveDesc" size="16" since="V20_2_0_8">
         <add name="Drive Type" type="NxD6JointDriveType" />
-        <add name="Restitution" type="float" />
         <add name="Spring" type="float" />
         <add name="Damping" type="float" />
+        <add name="Force Limit" type="float" default="#FLT_MAX#" />
     </compound>
 
     <compound name="NiPhysXJointLimit" since="V20_2_0_8">
@@ -5494,12 +5531,12 @@
 
     <niobject name="NiPhysXD6JointDesc" inherit="NiPhysXJointDesc" since="V20_2_0_8">
         A 6DOF (6 degrees of freedom) joint.
-        <add name="X Motion" type="NxD6JointMotion" />
-        <add name="Y Motion" type="NxD6JointMotion" />
-        <add name="Z Motion" type="NxD6JointMotion" />
-        <add name="Swing 1 Motion" type="NxD6JointMotion" />
-        <add name="Swing 2 Motion" type="NxD6JointMotion" />
-        <add name="Twist Motion" type="NxD6JointMotion" />
+        <add name="X Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <add name="Y Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <add name="Z Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <add name="Swing 1 Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <add name="Swing 2 Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <add name="Twist Motion" type="NxD6JointMotion" default="MOTION_FREE" />
         <add name="Linear Limit" type="NxJointLimitSoftDesc" />
         <add name="Swing 1 Limit" type="NxJointLimitSoftDesc" />
         <add name="Swing 2 Limit" type="NxJointLimitSoftDesc" />
@@ -5516,25 +5553,48 @@
         <add name="Drive Linear Velocity" type="Vector3" />
         <add name="Drive Angular Velocity" type="Vector3" />
         <add name="Projection Mode" type="NxJointProjectionMode" />
-        <add name="Projection Distance" type="float" />
-        <add name="Projection Angle" type="float" />
-        <add name="Gear Ratio" type="float" />
+        <add name="Projection Distance" type="float" default="0.1" />
+        <add name="Projection Angle" type="float" default="0.0872" />
+        <add name="Gear Ratio" type="float" default="1.0" />
         <add name="Flags" type="uint" />
     </niobject>
 
-    <enum name="NxShapeType" storage="uint" since="V20_2_0_8">
-        <option name="NX_SHAPE_PLANE" value="0" />
-        <option name="NX_SHAPE_SPHERE" value="1" />
-        <option name="NX_SHAPE_BOX" value="2" />
-        <option name="NX_SHAPE_CAPSULE" value="3" />
-        <option name="NX_SHAPE_WHEEL" value="4" />
-        <option name="NX_SHAPE_CONVEX" value="5" />
-        <option name="NX_SHAPE_MESH" value="6" />
-        <option name="NX_SHAPE_HEIGHTFIELD" value="7" />
-        <option name="NX_SHAPE_RAW_MESH" value="8" />
-        <option name="NX_SHAPE_COMPOUND" value="9" />
+    <enum name="NxShapeType" storage="uint" prefix="NX" since="V20_2_0_8">
+        <option value="0" name="SHAPE_PLANE" />
+        <option value="1" name="SHAPE_SPHERE" />
+        <option value="2" name="SHAPE_BOX" />
+        <option value="3" name="SHAPE_CAPSULE" />
+        <option value="4" name="SHAPE_WHEEL" />
+        <option value="5" name="SHAPE_CONVEX" />
+        <option value="6" name="SHAPE_MESH" />
+        <option value="7" name="SHAPE_HEIGHTFIELD" />
+        <option value="8" name="SHAPE_RAW_MESH" />
+        <option value="9" name="SHAPE_COMPOUND" />
     </enum>
 
+    <bitflags name="NxShapeFlag" storage="uint" prefix="NX_SF" since="V20_2_0_8">
+        <option value="0" name="TRIGGER_ON_ENTER" />
+        <option value="1" name="TRIGGER_ON_LEAVE" />
+        <option value="2" name="TRIGGER_ON_STAY" />
+        <option value="3" name="VISUALIZATION" />
+        <option value="4" name="DISABLE_COLLISION" />
+        <option value="5" name="FEATURE_INDICES" />
+        <option value="6" name="DISABLE_RAYCASTING" />
+        <option value="7" name="POINT_CONTACT_FORCE" />
+        <option value="8" name="FLUID_DRAIN" />
+        <option value="10" name="FLUID_DISABLE_COLLISION" />
+        <option value="11" name="FLUID_TWOWAY" />
+        <option value="12" name="DISABLE_RESPONSE" />
+        <option value="13" name="DYNAMIC_DYNAMIC_CCD" />
+        <option value="14" name="DISABLE_SCENE_QUERIES" />
+        <option value="15" name="CLOTH_DRAIN" />
+        <option value="16" name="CLOTH_DISABLE_COLLISION" />
+        <option value="17" name="CLOTH_TWOWAY" />
+        <option value="18" name="SOFTBODY_DRAIN" />
+        <option value="19" name="SOFTBODY_DISABLE_COLLISION" />
+        <option value="20" name="SOFTBODY_TWOWAY" />
+    </bitflags>
+
     <compound name="NxPlane" size="16" since="V20_2_0_8">
         <add name="Val 1" type="float" />
         <add name="Point 1" type="Vector3" />
@@ -5550,12 +5610,12 @@
         For serializing NxShapeDesc objects
         <add name="Shape Type" type="NxShapeType" />
         <add name="Local Pose" type="Matrix34" />
-        <add name="Shape Flags" type="uint" />
+        <add name="Flags" type="NxShapeFlag" default="0x120008" />
         <add name="Collision Group" type="ushort" />
         <add name="Material Index" type="ushort" />
-        <add name="Density" type="float" />
-        <add name="Mass" type="float" />
-        <add name="Skin Width" type="float" />
+        <add name="Density" type="float" default="1.0" />
+        <add name="Mass" type="float" default="-1.0" />
+        <add name="Skin Width" type="float" default="-1.0" />
         <add name="Shape Name" type="string" />
         <add name="Non Interacting Compartment Types" type="uint" ver1="20.4.0.0" />
         <add name="Collision Bits" type="uint" arr1="4" />
@@ -5579,13 +5639,10 @@
         <add name="Flags" type="byte" ver1="20.3.0.5" />
     </niobject>
 
-    <bitflags name="NxMaterialFlag" storage="uint" since="V20_2_0_8">
-        <option name="NX_MF_ANISOTROPIC" value="1" />
-        <option name="NX_MF_DUMMY1" value="2" />
-        <option name="NX_MF_DUMMY2" value="3" />
-        <option name="NX_MF_DUMMY3" value="4" />
-        <option name="NX_MF_DISABLE_FRICTION" value="5" />
-        <option name="NX_MF_DISABLE_STRONG_FRICTION" value="6" />
+    <bitflags name="NxMaterialFlag" storage="uint" prefix="NX_MF" since="V20_2_0_8">
+        <option value="0" name="ANISOTROPIC" />
+        <option value="4" name="DISABLE_FRICTION" />
+        <option value="5" name="DISABLE_STRONG_FRICTION" />
     </bitflags>
 
     <compound name="NxSpringDesc" size="12" since="V20_2_0_8">
@@ -5594,11 +5651,11 @@
         <add name="Target Value" type="float" />
     </compound>
 
-    <enum name="NxCombineMode" storage="uint" since="V20_2_0_8">
-        <option name="NX_CM_AVERAGE" value="0" />
-        <option name="NX_CM_MIN" value="1" />
-        <option name="NX_CM_MULTIPLY" value="2" />
-        <option name="NX_CM_MAX" value="3" />
+    <enum name="NxCombineMode" storage="uint" prefix="NX_CM" since="V20_2_0_8">
+        <option value="0" name="AVERAGE" />
+        <option value="1" name="MIN" />
+        <option value="2" name="MULTIPLY" />
+        <option value="3" name="MAX" />
     </enum>
 
     <compound name="NxMaterialDesc" since="V20_2_0_8">
@@ -5607,7 +5664,7 @@
         <add name="Restitution" type="float" />
         <add name="Dynamic Friction V" type="float" />
         <add name="Static Friction V" type="float" />
-        <add name="Direction of Anisotropy" type="Vector3" />
+        <add name="Direction of Anisotropy" type="Vector3" default="#X_AXIS#" />
         <add name="Flags" type="NxMaterialFlag" />
         <add name="Friction Combine Mode" type="NxCombineMode" />
         <add name="Restitution Combine Mode" type="NxCombineMode" />
@@ -5622,6 +5679,27 @@
         <add name="Material Descs" type="NxMaterialDesc" arr1="Num States" />
     </niobject>
 
+    <bitflags name="NxClothFlag" storage="uint" prefix="NX_CLF" since="V20_2_0_8">
+        <option value="0" name="PRESSURE" />
+        <option value="1" name="STATIC" />
+        <option value="2" name="DISABLE_COLLISION" />
+        <option value="3" name="SELFCOLLISION" />
+        <option value="4" name="VISUALIZATION" />
+        <option value="5" name="GRAVITY" />
+        <option value="6" name="BENDING" />
+        <option value="7" name="BENDING_ORTHO" />
+        <option value="8" name="DAMPING" />
+        <option value="9" name="COLLISION_TWOWAY" />
+        <option value="11" name="TRIANGLE_COLLISION" />
+        <option value="12" name="TEARABLE" />
+        <option value="13" name="HARDWARE" />
+        <option value="14" name="COMDAMPING" />
+        <option value="15" name="VALIDBOUNDS" />
+        <option value="16" name="FLUID_COLLISION" />
+        <option value="17" name="DISABLE_DYNAMIC_CCD" />
+        <option value="18" name="ADHERE" />
+    </bitflags>
+
     <compound name="PhysXClothState" since="V20_2_0_8">
         <add name="Pose" type="Matrix34" />
         <add name="Num Vertex Positions" type="ushort" />
@@ -5649,33 +5727,33 @@
         <add name="Name" type="string" />
         <add name="Mesh" type="Ref" template="NiPhysXMeshDesc" />
         <add name="Pose" type="Matrix34" ver2="20.3.0.9" />
-        <add name="Thickness" type="float" />
+        <add name="Thickness" type="float" default="0.01" />
         <add name="Self Collision Thickness" type="float" ver1="30.1.0.3" />
-        <add name="Density" type="float" />
-        <add name="Bending Stiffness" type="float" />
-        <add name="Stretching Stiffness" type="float" />
-        <add name="Damping Coefficient" type="float" />
+        <add name="Density" type="float" default="1.0" />
+        <add name="Bending Stiffness" type="float" default="1.0" />
+        <add name="Stretching Stiffness" type="float" default="1.0" />
+        <add name="Damping Coefficient" type="float" default="0.5" />
         <add name="Hard Stretch Limitation Factor" type="float" ver1="30.1.0.3" />
-        <add name="Friction" type="float" />
-        <add name="Pressure" type="float" />
-        <add name="Tear Factor" type="float" />
-        <add name="Collision Response Coeff" type="float" />
-        <add name="Attach Response Coeff" type="float" />
-        <add name="Attach Tear Factor" type="float" />
-        <add name="To Fluid Response Coeff" type="float" ver1="20.4.0.0" />
-        <add name="From Fluid Response Coeff" type="float" ver1="20.4.0.0" />
-        <add name="Min Adhere Velocity" type="float" ver1="20.4.0.0" />
-        <add name="Relative Grid Spacing" type="float" ver1="20.4.0.0" />
-        <add name="Solver Iterations" type="uint" />
+        <add name="Friction" type="float" default="0.5" />
+        <add name="Pressure" type="float" default="1.0" />
+        <add name="Tear Factor" type="float" default="1.5" />
+        <add name="Collision Response Coeff" type="float" default="0.2" />
+        <add name="Attach Response Coeff" type="float" default="0.2" />
+        <add name="Attach Tear Factor" type="float" default="1.5" />
+        <add name="To Fluid Response Coeff" type="float" default="1.0" ver1="20.4.0.0" />
+        <add name="From Fluid Response Coeff" type="float" default="1.0" ver1="20.4.0.0" />
+        <add name="Min Adhere Velocity" type="float" default="1.0" ver1="20.4.0.0" />
+        <add name="Relative Grid Spacing" type="float" default="0.25" ver1="20.4.0.0" />
+        <add name="Solver Iterations" type="uint" default="5" />
         <add name="Hier Solver Iterations" type="uint" ver1="30.1.0.3" />
         <add name="External Acceleration" type="Vector3" />
-        <add name="Wind Acceleration" type="float" ver1="20.4.0.0" />
-        <add name="Wake Up Counter" type="float" />
-        <add name="Sleep Linear Velocity" type="float" />
+        <add name="Wind Acceleration" type="Vector3" ver1="20.4.0.0" />
+        <add name="Wake Up Counter" type="float" default="0.4" />
+        <add name="Sleep Linear Velocity" type="float" default="-1.0" />
         <add name="Collision Group" type="ushort" />
         <add name="Collision Bits" type="uint" arr1="4" />
         <add name="Force Field Material" type="ushort" ver1="20.4.0.0" />
-        <add name="Flags" type="uint" />
+        <add name="Flags" type="NxClothFlag" default="0x20" />
         <add name="Vertex Map Size" type="ushort" ver1="30.2.0.3" />
         <add name="Vertex Map" type="ushort" arr1="Vertex Map Size" ver1="30.2.0.3" />
         <add name="Num States" type="uint" ver1="20.4.0.0" />
@@ -5689,7 +5767,7 @@
 
     <niobject name="NiPhysXDest" inherit="NiObject" abstract="true" since="V20_2_0_8">
         A destination is a link between a PhysX actor and a Gamebryo object being driven by the physics.
-        <add name="Active" type="bool" />
+        <add name="Active" type="bool" default="1" />
         <add name="Interpolate" type="bool" />
     </niobject>
 
@@ -5704,7 +5782,7 @@
 
     <niobject name="NiPhysXSrc" inherit="NiObject" abstract="true" since="V20_2_0_8">
         A source is a link between a Gamebryo object and a PhysX actor.
-        <add name="Active" type="bool" />
+        <add name="Active" type="bool" default="1" />
         <add name="Interpolate" type="bool" />
     </niobject>
 
@@ -6176,9 +6254,9 @@
 
     <niobject name="BSLightingShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Bethesda shader property for Skyrim and later.
-        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="!#BS_FO4#" default="2185233153">Skyrim Shader Flags for setting render/shader options.</add>
-        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="!#BS_FO4#" default="32801">Skyrim Shader Flags for setting render/shader options.</add>
-        <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" vercond="#BS_FO4#" default="2151678465">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
+        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="!#BS_FO4#" default="0x82400301">Skyrim Shader Flags for setting render/shader options.</add>
+        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="!#BS_FO4#" default="0x8021">Skyrim Shader Flags for setting render/shader options.</add>
+        <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" vercond="#BS_FO4#" default="0x80400201">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
         <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" vercond="#BS_FO4#" default="1">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
         <add name="UV Offset" type="TexCoord">Offset UVs</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
@@ -6191,7 +6269,7 @@
         <add name="Refraction Strength" type="float">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
         <add name="Glossiness" type="float" default="80" vercond="#NI_BS_LT_FO4#">The material specular power, or glossiness (0-999).</add>
         <add name="Smoothness" type="float" default="1.0" vercond="#BS_FO4#">The base roughness (0.0-1.0), multiplied by the smoothness map.</add>
-        <add name="Specular Color" type="Color3">Adds a colored highlight.</add>
+        <add name="Specular Color" type="Color3" default="#VEC3_ONE#">Adds a colored highlight.</add>
         <add name="Specular Strength" type="float" default="1.0">Brightness of specular highlight. (0=not visible) (0-999)</add>
         <add name="Lighting Effect 1" type="float" default="0.3" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
         <add name="Lighting Effect 2" type="float" default="2.0" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
@@ -6209,9 +6287,9 @@
         <add name="Environment Map Scale" type="float" default="1.0" cond="Skyrim Shader Type == 1">Scales the intensity of the environment/cube map. (0-1)</add>
         <add name="Use Screen Space Reflections" type="bool" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
         <add name="Wetness Control: Use SSR" type="bool" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
-        <add name="Skin Tint Color" type="Color3" cond="Skyrim Shader Type == 5">Tints the base texture. Overridden by game settings.</add>
+        <add name="Skin Tint Color" type="Color3" default="#VEC3_ONE#" cond="Skyrim Shader Type == 5">Tints the base texture. Overridden by game settings.</add>
         <add name="Skin Tint Alpha" type="float" default="1.0" cond="Skyrim Shader Type == 5" vercond="#BS_FO4#" />
-        <add name="Hair Tint Color" type="Color3" cond="Skyrim Shader Type == 6">Tints the base texture. Overridden by game settings.</add>
+        <add name="Hair Tint Color" type="Color3" default="#VEC3_ONE#" cond="Skyrim Shader Type == 6">Tints the base texture. Overridden by game settings.</add>
         <add name="Max Passes" type="float" cond="Skyrim Shader Type == 7">Max Passes</add>
         <add name="Scale" type="float" cond="Skyrim Shader Type == 7">Scale</add>
         <add name="Parallax Inner Layer Thickness" type="float" default="5.0" cond="Skyrim Shader Type == 11">How far from the surface the inner layer appears to be.</add>
@@ -6226,30 +6304,30 @@
 
     <niobject name="BSEffectShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Bethesda effect shader property for Skyrim and later.
-        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="2147483648" vercond="!#BS_FO4#" />
-        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="32" vercond="!#BS_FO4#" />
-        <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" default="2147483648" vercond="#BS_FO4#" />
-        <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" default="32" vercond="#BS_FO4#" />
+        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="0x80000000" vercond="!#BS_FO4#" />
+        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="0x20" vercond="!#BS_FO4#" />
+        <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" default="0x80000000" vercond="#BS_FO4#" />
+        <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" default="0x20" vercond="#BS_FO4#" />
         <add name="UV Offset" type="TexCoord">Offset UVs</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures</add>
         <add name="Source Texture"  type="SizedString">points to an external texture.</add>
         <!-- TODO: Next 4 bytes requires bitfield, read as single int -->
-        <add name="Texture Clamp Mode" type="byte">How to handle texture borders.</add>
-        <add name="Lighting Influence" type="byte" />
+        <add name="Texture Clamp Mode" type="byte" default="3">How to handle texture borders.</add>
+        <add name="Lighting Influence" type="byte" default="255" />
         <add name="Env Map Min LOD" type="byte" />
         <add name="Unused Byte" type="byte" />
         <add name="Falloff Start Angle" type="float" default="1.0">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
         <add name="Falloff Stop Angle" type="float" default="1.0">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
         <add name="Falloff Start Opacity" type="float">Alpha falloff multiplier at start angle</add>
         <add name="Falloff Stop Opacity" type="float">Alpha falloff multiplier at end angle</add>
-        <add name="Emissive Color" type="Color4">Emissive color</add>
+        <add name="Emissive Color" type="Color4" default="#VEC4_ONE#">Emissive color</add>
         <add name="Emissive Multiple" type="float" default="1.0">Multiplier for Emissive Color (RGB part)</add>
-        <add name="Soft Falloff Depth" type="float"></add>
+        <add name="Soft Falloff Depth" type="float" default="100.0" />
         <add name="Greyscale Texture"  type="SizedString">Points to an external texture, used as palette for SLSF1_Greyscale_To_PaletteColor/SLSF1_Greyscale_To_PaletteAlpha.</add>
         <add name="Env Map Texture" type="SizedString" vercond="#BS_FO4#" />
         <add name="Normal Texture" type="SizedString" vercond="#BS_FO4#" />
         <add name="Env Mask Texture" type="SizedString" vercond="#BS_FO4#" />
-        <add name="Environment Map Scale" type="float" vercond="#BS_FO4#" />
+        <add name="Environment Map Scale" type="float" default="1.0" vercond="#BS_FO4#" />
     </niobject>
     
     <bitflags name="WaterShaderPropertyFlags" storage="uint" prefix="BSWSP" versions="#SKY_AND_LATER#">
@@ -6272,17 +6350,17 @@
     
     <niobject name="BSWaterShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Skyrim water shader property, different from "WaterShaderProperty" seen in Fallout.
-        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="2147483656" />
-        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="33" />
+        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000008" />
+        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" />
         <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
-        <add name="Water Shader Flags" type="WaterShaderPropertyFlags" default="196" />
+        <add name="Water Shader Flags" type="WaterShaderPropertyFlags" default="0xC4" />
     </niobject>
     
     <niobject name="BSSkyShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
         Skyrim Sky shader block.
-        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="2147483648" />
-        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="33" />
+        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000000" />
+        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" />
         <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Source Texture" type="SizedString">points to an external texture.</add>
@@ -6291,7 +6369,7 @@
 
     <niobject name="BSDismemberSkinInstance" inherit="NiSkinInstance" versions="#BETHESDA#">
         Bethesda-specific skin instance.
-        <add name="Num Partitions" type="uint" />
+        <add name="Num Partitions" type="uint" default="1" />
         <add name="Partitions" type="BodyPartList" arr1="Num Partitions" />
     </niobject>
 
@@ -6342,7 +6420,7 @@
 
     <niobject name="BSPSysStripUpdateModifier" inherit="NiPSysModifier" versions="#FO3_AND_LATER#">
         Bethesda-Specific (mesh?) Particle System Modifier.
-        <add name="Update Delta Time" type="float" />
+        <add name="Update Delta Time" type="float" default="0.033333" />
     </niobject>
 
 
@@ -6354,7 +6432,7 @@
 
     <niobject name="BSMasterParticleSystem" inherit="NiNode" versions="#FO3_AND_LATER#">
         Bethesda-Specific particle system.
-        <add name="Max Emitter Objects" type="ushort" />
+        <add name="Max Emitter Objects" type="ushort" default="20" />
         <add name="Num Particle Systems" type="uint" />
         <add name="Particle Systems" type="Ref" template="NiAVObject" arr1="Num Particle Systems" />
 
@@ -6974,10 +7052,10 @@
         <add name="Has Rotations" type="bool" />
         <add name="Has Rotation Axes" type="bool" />
         <add name="Has Animated Textures" type="bool" ver1="20.6.1.0" />
-        <add name="World Space" type="bool" />
-        <add name="Normal Method" type="AlignMethod" ver1="20.6.1.0" />
+        <add name="World Space" type="bool" default="1" />
+        <add name="Normal Method" type="AlignMethod" default="ALIGN_CAMERA" ver1="20.6.1.0" />
         <add name="Normal Direction" type="Vector3" ver1="20.6.1.0" />
-        <add name="Up Method" type="AlignMethod" ver1="20.6.1.0" />
+        <add name="Up Method" type="AlignMethod" default="ALIGN_CAMERA" ver1="20.6.1.0" />
         <add name="Up Direction" type="Vector3" ver1="20.6.1.0" />
         <add name="Living Spawner" type="Ref" template="NiPSSpawner" ver1="20.6.1.0" />
         <add name="Num Spawn Rate Keys" type="byte" ver1="20.6.1.0" />
@@ -7004,23 +7082,23 @@
     <niobject name="NiPSAlignedQuadGenerator" inherit="NiMeshModifier" since="V20_5_0_0">
         A mesh modifier that uses particle system data to generate aligned quads for each particle.
         <add name="Scale Amount U" type="float" />
-        <add name="Scale Limit U" type="float" />
-        <add name="Scale Rest U" type="float" />
+        <add name="Scale Limit U" type="float" default="10000.0" />
+        <add name="Scale Rest U" type="float" default="1.0" />
         <add name="Scale Amount V" type="float" />
-        <add name="Scale Limit V" type="float" />
-        <add name="Scale Rest V" type="float" />
+        <add name="Scale Limit V" type="float" default="10000.0" />
+        <add name="Scale Rest V" type="float" default="1.0" />
         <add name="Center U" type="float" />
         <add name="Center V" type="float" />
         <add name="UV Scrolling" type="bool" />
-        <add name="Num Frames Across" type="ushort" />
-        <add name="Num Frames Down" type="ushort" />
+        <add name="Num Frames Across" type="ushort" default="1" />
+        <add name="Num Frames Down" type="ushort" default="1" />
         <add name="Ping Pong" type="bool" />
         <add name="Initial Frame" type="ushort" />
         <add name="Initial Frame Variation" type="float" />
         <add name="Num Frames" type="ushort" />
         <add name="Num Frames Variation" type="float" />
         <add name="Initial Time" type="float" />
-        <add name="Final Time" type="float" />
+        <add name="Final Time" type="float" default="1.0" />
     </niobject>
 
     <!-- NiPS Simulators -->
@@ -7047,13 +7125,13 @@
         Encapsulates a floodgate kernel that updates particle size, colors, and rotations.
         <add name="Num Size Keys" type="byte" ver1="20.6.1.0" />
         <add name="Size Keys" type="Key" template="float" arg="1" arr1="Num Size Keys" ver1="20.6.1.0">The particle size keys.</add>
-        <add name="Size Loop Behavior" type="PSLoopBehavior" ver1="20.6.1.0">The loop behavior for the size keys.</add>
+        <add name="Size Loop Behavior" type="PSLoopBehavior" default="PS_LOOP_AGESCALE" ver1="20.6.1.0">The loop behavior for the size keys.</add>
         <add name="Num Color Keys" type="byte" />
         <add name="Color Keys" type="Key" template="ByteColor4" arg="1" arr1="Num Color Keys">The particle color keys.</add>
-        <add name="Color Loop Behavior" type="PSLoopBehavior" ver1="20.6.1.0">The loop behavior for the color keys.</add>
+        <add name="Color Loop Behavior" type="PSLoopBehavior" default="PS_LOOP_AGESCALE" ver1="20.6.1.0">The loop behavior for the color keys.</add>
         <add name="Num Rotation Keys" type="byte" ver1="20.6.1.0" />
         <add name="Rotation Keys" type="QuatKey" template="Quaternion" arg="1" arr1="Num Rotation Keys" ver1="20.6.1.0">The particle rotation keys.</add>
-        <add name="Rotation Loop Behavior" type="PSLoopBehavior" ver1="20.6.1.0">The loop behavior for the rotation keys.</add>
+        <add name="Rotation Loop Behavior" type="PSLoopBehavior" default="PS_LOOP_AGESCALE" ver1="20.6.1.0">The loop behavior for the rotation keys.</add>
         <add name="Grow Time" type="float"> The the amount of time over which a particle's size is ramped from 0.0 to 1.0 in seconds</add>
         <add name="Shrink Time" type="float">The the amount of time over which a particle's size is ramped from 1.0 to 0.0 in seconds</add>
         <add name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</add>
@@ -7604,17 +7682,34 @@
         <add name="Accum Flags" type="AccumFlags" default="ACCUM_X_FRONT" />
     </niobject>
 
+    <bitflags name="NiShadowGeneratorFlags" storage="ushort">
+        Flags for NiShadowGenerator.
+        Bit Patterns:
+            AUTO_CALC_NEARFAR = (AUTO_NEAR_DIST | AUTO_FAR_DIST) = 0xC0
+            AUTO_CALC_FULL = (AUTO_NEAR_DIST | AUTO_FAR_DIST | AUTO_DIR_LIGHT_FRUSTUM_WIDTH | AUTO_DIR_LIGHT_FRUSTUM_POSITION) = 0x3C0
+        <option value="0" name="DIRTY_SHADOWMAP" />
+        <option value="1" name="DIRTY_RENDERVIEWS" />
+        <option value="2" name="GEN_STATIC" />
+        <option value="3" name="GEN_ACTIVE" />
+        <option value="4" name="RENDER_BACKFACES" />
+        <option value="5" name="STRICTLY_OBSERVE_SIZE_HINT" />
+        <option value="6" name="AUTO_NEAR_DIST" />
+        <option value="7" name="AUTO_FAR_DIST" />
+        <option value="8" name="AUTO_DIR_LIGHT_FRUSTUM_WIDTH" />
+        <option value="9" name="AUTO_DIR_LIGHT_FRUSTUM_POSITION" />
+    </bitflags>
+
     <niobject name="NiShadowGenerator" inherit="NiObject">
         An NiShadowGenerator object is attached to an NiDynamicEffect object to inform the shadowing system that the effect produces shadows.
-        <add name="Name" type="string" />
-        <add name="Flags" type="ushort" />
+        <add name="Name" type="string" default="NiStandardShadowTechnique" />
+        <add name="Flags" type="NiShadowGeneratorFlags" default="0x3DB" />
         <add name="Num Shadow Casters" type="uint" />
         <add name="Shadow Casters" type="Ref" template="NiNode" arr1="Num Shadow Casters" />
         <add name="Num Shadow Receivers" type="uint" />
         <add name="Shadow Receivers" type="Ref" template="NiNode" arr1="Num Shadow Receivers" />
         <add name="Target" type="Ptr" template="NiDynamicEffect" />
-        <add name="Depth Bias" type="float" default="0.98" />
-        <add name="Size Hint" type="ushort" />
+        <add name="Depth Bias" type="float" />
+        <add name="Size Hint" type="ushort" default="1024" />
         <add name="Near Clipping Distance" type="float" ver1="20.3.0.7" />
         <add name="Far Clipping Distance" type="float" ver1="20.3.0.7" />
         <add name="Directional Light Frustum Width" type="float" ver1="20.3.0.7" />

From b22220b9d240092c778821fe26ec7690f112987e Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Wed, 25 Jul 2018 23:51:25 -0400
Subject: [PATCH 69/86] Initial Module commit

For #72

Renamed modules from Gamebryo:  NiParticle, NiPSParticle.

As of Gamebryo 2.5, old NiParticle was renamed NiParticleOld and the new NiMesh-based particle system was named NiParticle.  I didn't like this naming scheme given NiParticleOld is more important to us.

Ni Modules not in Gamebryo:  NiCustom, NiLegacy

These are to handle third party blocks and blocks from NetImmerse (pre-Gamebryo).

Ignored from Gamebryo:  NiCollision, NiPortal, NiPhysXParticle

These were instead absorbed into other modules.

Bethesda modules:  BSMain, BSAnimation, BSParticle, BSHavok, BSLegacy

Animation, Particle, Havok, and Legacy are not modules used by Bethesda.  Legacy is for Morrowind-specific blocks (NetImmerse).  In addition,  BSShader is a module for all the shader related blocks and that has all been folded into BSMain.
---
 nif.xml | 1112 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 564 insertions(+), 548 deletions(-)

diff --git a/nif.xml b/nif.xml
index b442fec..09e3712 100644
--- a/nif.xml
+++ b/nif.xml
@@ -83,6 +83,20 @@
     <version id="V30_1_0_3" num="30.1.0.3">Rocksmith, Rocksmith 2014</version>
     <version id="V30_2_0_3" num="30.2.0.3">Ghost In The Shell: First Assault, MapleStory 2</version>
 
+    <module name="NiMain" priority="0" />
+    <module name="NiAnimation" priority="25" depends="NiMain" />
+    <module name="NiParticle" priority="50" depends="NiMain NiAnimation" />
+    <module name="NiMesh" priority="70" depends="NiMain NiAnimation" />
+    <module name="NiPSParticle" priority="80" depends="NiMain NiMesh NiAnimation" />
+    <module name="NiPhysX" priority="90" depends="NiMain NiMesh NiPSParticle" />
+    <module name="NiLegacy" priority="99" depends="NiMain NiAnimation NiParticle" />
+    <module name="BSMain" priority="100" depends="NiMain" />
+    <module name="BSAnimation" priority="125" depends="NiMain BSMain NiAnimation" />
+    <module name="BSParticle" priority="150" depends="NiMain NiParticle" />
+    <module name="BSHavok" priority="190" depends="NiMain" />
+    <module name="BSLegacy" priority="199" depends="NiMain NiLegacy" />
+    <module name="NiCustom" priority="255" depends="NiMain NiParticle" />
+
     <token name="verexpr" attrs="vercond">
         Commonly used version expressions.
         NOTE: `string` should be wrapped in parentheses for string subsitutions in larger expressions.
@@ -2513,11 +2527,11 @@
          are treated as object types by the NIF format and can inherit
          from other classes.-->
 
-    <niobject name="NiObject" abstract="true">
+    <niobject name="NiObject" abstract="true" module="NiMain">
         Abstract object type.
     </niobject>
 
-    <niobject name="Ni3dsAlphaAnimator" inherit="NiObject" versions="V2_3">
+    <niobject name="Ni3dsAlphaAnimator" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown.
         <add name="Unknown 1" type="byte" arr1="40" />
         <add name="Parent" type="Ref" template="NiObject" />
@@ -2526,7 +2540,7 @@
         <add name="Unknown 2" type="uint" arr1="Num 1 * Num 2" arr2="2" />
     </niobject>
 
-    <niobject name="Ni3dsAnimationNode" inherit="NiObject" versions="V2_3">
+    <niobject name="Ni3dsAnimationNode" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown. Only found in 2.3 nifs.
         <add name="Name" type="string">Name of this object.</add>
         <add name="Has Data" type="bool" />
@@ -2538,34 +2552,34 @@
         <add name="Unknown Array" type="byte" arr1="Count" arr2="5" cond="Has Data" />
     </niobject>
 
-    <niobject name="Ni3dsColorAnimator" inherit="NiObject" versions="V2_3">
+    <niobject name="Ni3dsColorAnimator" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="184" />
     </niobject>
 
-    <niobject name="Ni3dsMorphShape" inherit="NiObject" versions="V2_3">
+    <niobject name="Ni3dsMorphShape" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="14" />
     </niobject>
 
-    <niobject name="Ni3dsParticleSystem" inherit="NiObject" versions="V2_3">
+    <niobject name="Ni3dsParticleSystem" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="14" />
     </niobject>
 
-    <niobject name="Ni3dsPathController" inherit="NiObject" versions="V2_3">
+    <niobject name="Ni3dsPathController" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown!
         <add name="Unknown 1" type="byte" arr1="20" />
     </niobject>
 
 
-    <niobject name="NiParticleModifier" abstract="true" inherit="NiObject" until="V10_0_1_0">
+    <niobject name="NiParticleModifier" abstract="true" inherit="NiObject" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1). Abstract base class for particle system modifiers.
         <add name="Next Modifier" type="Ref" template="NiParticleModifier">Next particle modifier.</add>
         <add name="Controller" type="Ptr" template="NiParticleSystemController" ver1="3.3.0.13">Points to the particle system controller parent.</add>
     </niobject>
 
-    <niobject name="NiPSysCollider" abstract="true" inherit="NiObject">
+    <niobject name="NiPSysCollider" abstract="true" inherit="NiObject" module="NiParticle">
         Particle system collider.
         <add name="Bounce" type="float" default="1.0">Amount of bounce for the collider.</add>
         <add name="Spawn on Collide" type="bool">Spawn particles on impact?</add>
@@ -2583,11 +2597,11 @@
         <option value="3" name="BROAD_PHASE_BORDER" />
     </enum>
 
-    <niobject name="bhkRefObject" abstract="true" inherit="NiObject" versions="#BETHESDA#">
+    <niobject name="bhkRefObject" abstract="true" inherit="NiObject" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkReferencedObject, the base for all classes in the Havok SDK.
     </niobject>
 
-    <niobject name="bhkSerializable" abstract="true" inherit="bhkRefObject" versions="#BETHESDA#">
+    <niobject name="bhkSerializable" abstract="true" inherit="bhkRefObject" module="BSHavok" versions="#BETHESDA#">
         Bethesda class to combine NiObject and hkReferencedObject so that Havok classes can be read/written with NiStream.
     </niobject>
 
@@ -2605,7 +2619,7 @@
         <add name="Property" type="bhkWorldObjCInfoProperty" />
     </compound>
 
-    <niobject name="bhkWorldObject" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
+    <niobject name="bhkWorldObject" abstract="true" inherit="bhkSerializable" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpWorldObject, the base class for hkpEntity and hkpPhantom.
         <add name="Shape" type="Ref" template="bhkShape">The shape for this collision object.</add>
         <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
@@ -2613,12 +2627,12 @@
         <add name="World Object Info" type="bhkWorldObjectCInfo" />
     </niobject>
 
-    <niobject name="bhkPhantom" abstract="true" inherit="bhkWorldObject" versions="#BETHESDA#">
+    <niobject name="bhkPhantom" abstract="true" inherit="bhkWorldObject" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpPhantom. A Phantom is the core non-physical object in the system.
         Receives events when an overlap with another phantom or an entity begins or ends.
     </niobject>
 
-    <niobject name="bhkAabbPhantom" inherit="bhkPhantom" versions="#BETHESDA#">
+    <niobject name="bhkAabbPhantom" inherit="bhkPhantom" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpAabbPhantom. A non-physical object made up of only an AABB.
             - Very fast as they use only broadphase collision detection.
             - Used for triggers/regions where a shape is not necessary.
@@ -2626,11 +2640,11 @@
         <add name="AABB" type="hkAabb" />
     </niobject>
 
-    <niobject name="bhkShapePhantom" abstract="true" inherit="bhkPhantom" versions="#BETHESDA#">
+    <niobject name="bhkShapePhantom" abstract="true" inherit="bhkPhantom" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpShapePhantom, a base for hkpSimpleShapePhantom and hkpCachingShapePhantom.
     </niobject>
 
-    <niobject name="bhkSimpleShapePhantom" inherit="bhkShapePhantom" versions="#BETHESDA#">
+    <niobject name="bhkSimpleShapePhantom" inherit="bhkShapePhantom" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpSimpleShapePhantom. A Phantom with arbitrary shape and transform.
         Does not do any narrowphase caching, in contrast to hkpCachingShapePhantom.
         <add name="Unused 01" type="byte" arr1="8" binary="true" />
@@ -2643,7 +2657,7 @@
         <add name="Process Contact Callback Delay" type="ushort" default="0xffff">Lowers the frequency for processContactCallbacks. A value of 5 means that a callback is raised every 5th frame. The default is once every 65535 frames.</add>
     </compound>
 
-    <niobject name="bhkEntity" abstract="true" inherit="bhkWorldObject" versions="#BETHESDA#">
+    <niobject name="bhkEntity" abstract="true" inherit="bhkWorldObject" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpEntity. An Entity is the core physical object in the system.
         <add name="Entity Info" type="bhkEntityCInfo" />
     </niobject>
@@ -2771,7 +2785,7 @@
         <add name="Unused 06" type="byte" arr1="3" binary="true" />
     </compound>
 
-    <niobject name="bhkRigidBody" inherit="bhkEntity" versions="#BETHESDA#">
+    <niobject name="bhkRigidBody" inherit="bhkEntity" module="BSHavok" versions="#BETHESDA#">
         This is the default body type for all "normal" usable and static world objects. The "T" suffix
         marks this body as active for translation and rotation, a normal bhkRigidBody ignores those
         properties. Because the properties are equal, a bhkRigidBody may be renamed into a bhkRigidBodyT and vice-versa.
@@ -2784,76 +2798,76 @@
         <add name="Body Flags" type="ushort" vercond="#BSVER# #GTE# 76">1 = respond to wind</add>
     </niobject>
 
-    <niobject name="bhkRigidBodyT" inherit="bhkRigidBody" versions="#BETHESDA#">
+    <niobject name="bhkRigidBodyT" inherit="bhkRigidBody" module="BSHavok" versions="#BETHESDA#">
         The "T" suffix marks this body as active for translation and rotation.
     </niobject>
 
 
-    <niobject name="bhkAction" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
+    <niobject name="bhkAction" abstract="true" inherit="bhkSerializable" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpAction. hkpAction performs some action on a body or bodies during every simulation step.
     </niobject>
 
-    <niobject name="bhkUnaryAction" abstract="true" inherit="bhkAction" versions="#BETHESDA#">
+    <niobject name="bhkUnaryAction" abstract="true" inherit="bhkAction" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpUnaryAction. hkpUnaryAction performs an action on one body.
         <add name="Entity" type="Ptr" template="bhkRigidBody" />
         <add name="Unused 01" type="byte" arr1="8" binary="true" />
     </niobject>
 
-    <niobject name="bhkBinaryAction" abstract="true" inherit="bhkAction" versions="#BETHESDA#">
+    <niobject name="bhkBinaryAction" abstract="true" inherit="bhkAction" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpBinaryAction. hkpBinaryAction performs an action on two bodies.
         <add name="Entity A" type="Ptr" template="bhkRigidBody" />
         <add name="Entity B" type="Ptr" template="bhkRigidBody" />
         <add name="Unused 01" type="byte" arr1="8" binary="true" />
     </niobject>
 
-    <niobject name="bhkConstraint" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
+    <niobject name="bhkConstraint" abstract="true" inherit="bhkSerializable" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpConstraintData. Base class for all constraints. 
         <add name="Constraint Info" type="bhkConstraintCInfo" />
     </niobject>
 
-    <niobject name="bhkLimitedHingeConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
+    <niobject name="bhkLimitedHingeConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpLimitedHingeConstraintData. Hinge constraint with limits and a motor.
         Enabling the motor will remove any friction.
         <add name="Constraint" type="bhkLimitedHingeConstraintCInfo" />
     </niobject>
 
-    <niobject name="bhkMalleableConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
+    <niobject name="bhkMalleableConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpMalleableConstraintData. Constraint wrapper used to soften or harden constraints.
         Does not affect angular limits or angular motors.
         <add name="Constraint" type="bhkMalleableConstraintCInfo" />
     </niobject>
 
-    <niobject name="bhkStiffSpringConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
+    <niobject name="bhkStiffSpringConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpStiffSpringConstraintData. Holds two bodies at a specified distance from one another.
         <add name="Constraint" type="bhkStiffSpringConstraintCInfo" />
     </niobject>
 
-    <niobject name="bhkRagdollConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
+    <niobject name="bhkRagdollConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpRagdollConstraintData. Creates a joint between two bodies with 3 degrees of freedom and a motor.
         Enabling the motor will remove any friction.
         The area of movement can be represented as a main cone + 2 orthogonal cones which may subtract from the main cone volume depending on limits. 
         <add name="Constraint" type="bhkRagdollConstraintCInfo" />
     </niobject>
 
-    <niobject name="bhkPrismaticConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
+    <niobject name="bhkPrismaticConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpPrismaticConstraintData.
         Creates a rail between two bodies that allows translation along a single axis with linear limits and a motor.
         All three rotation axes and the remaining two translation axes are fixed.
         <add name="Constraint" type="bhkPrismaticConstraintCInfo" />
     </niobject>
 
-    <niobject name="bhkHingeConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
+    <niobject name="bhkHingeConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpHingeConstraintData. A basic hinge with no angular limits or motor.
         <add name="Constraint" type="bhkHingeConstraintCInfo" />
     </niobject>
 
-    <niobject name="bhkBallAndSocketConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
+    <niobject name="bhkBallAndSocketConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpBallAndSocketConstraintData.
         Point-to-point constraint that attempts to keep the pivot point of two bodies in the same space.
         <add name="Constraint" type="bhkBallAndSocketConstraintCInfo" />
     </niobject>
 
-    <niobject name="bhkBallSocketConstraintChain" inherit="bhkSerializable" versions="#BETHESDA#">
+    <niobject name="bhkBallSocketConstraintChain" inherit="bhkSerializable" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpBallSocketChainData. A chain of ball and socket constraints.
         <add name="Num Pivots" type="uint" calc="#LEN[Pivots]# * 2">Should equal (Num Chained Entities - 1) * 2</add>
         <add name="Pivots" type="bhkBallAndSocketConstraintCInfo" arr1="Num Pivots / 2">Two pivot points A and B for each constraint.</add>
@@ -2864,12 +2878,12 @@
         <add name="Constraint Chain Info" type="bhkConstraintChainCInfo" />
     </niobject>
 
-    <niobject name="bhkShape" abstract="true" inherit="bhkSerializable" versions="#BETHESDA#">
+    <niobject name="bhkShape" abstract="true" inherit="bhkSerializable" module="BSHavok" versions="#BETHESDA#">
         The base class for narrowphase collision detection objects.
         All narrowphase collision detection is performed between pairs of bhkShape objects by creating appropriate collision agents.
     </niobject>
 
-    <niobject name="bhkTransformShape" inherit="bhkShape" versions="#BETHESDA#">
+    <niobject name="bhkTransformShape" inherit="bhkShape" module="BSHavok" versions="#BETHESDA#">
         Contains a bhkShape and an additional transform for that shape.
         <add name="Shape" type="Ref" template="bhkShape">The shape that this object transforms.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
@@ -2878,26 +2892,26 @@
         <add name="Transform" type="Matrix44">A transform matrix.</add>
     </niobject>
 
-    <niobject name="bhkConvexShapeBase" abstract="true" inherit="bhkShape" versions="#BETHESDA#">
+    <niobject name="bhkConvexShapeBase" abstract="true" inherit="bhkShape" module="BSHavok" versions="#BETHESDA#">
         An imaginary abstract base to solve inheritance issues in nif.xml with Havok serialization not matching class hierarchy.
     </niobject>
 
-    <niobject name="bhkSphereRepShape" abstract="true" inherit="bhkConvexShapeBase" versions="#BETHESDA#">
+    <niobject name="bhkSphereRepShape" abstract="true" inherit="bhkConvexShapeBase" module="BSHavok" versions="#BETHESDA#">
         An interface that produces a set of spheres that represent a simplified version of the shape.
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
     </niobject>
 
-    <niobject name="bhkConvexShape" abstract="true" inherit="bhkSphereRepShape" versions="#BETHESDA#">
+    <niobject name="bhkConvexShape" abstract="true" inherit="bhkSphereRepShape" module="BSHavok" versions="#BETHESDA#">
         An interface that allows testing convex sets using the GJK algorithm. Also holds a radius value for creating a shell.
         <add name="Radius" type="float" default="0.05">The radius is used to create a thin shell that is used as the shape surface.</add>
     </niobject>
 
-    <niobject name="bhkHeightFieldShape" inherit="bhkShape" abstract="true" versions="#BETHESDA#">
+    <niobject name="bhkHeightFieldShape" abstract="true" inherit="bhkShape" module="BSHavok" versions="#BETHESDA#">
         An interface for a shape which can collide with an array of spheres.
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
     </niobject>
 
-    <niobject name="bhkPlaneShape" inherit="bhkHeightFieldShape" versions="#BETHESDA#">
+    <niobject name="bhkPlaneShape" inherit="bhkHeightFieldShape" module="BSHavok" versions="#BETHESDA#">
         Contains a normal and distance from the origin, bounded by a given AABB.
         <add name="Unused 01" type="byte" arr1="12" binary="true" />
         <add name="Plane Normal" type="Vector3" />
@@ -2906,11 +2920,11 @@
         <add name="AABB Center" type="Vector4" />
     </niobject>
 
-    <niobject name="bhkSphereShape" inherit="bhkConvexShape" versions="#BETHESDA#">
+    <niobject name="bhkSphereShape" inherit="bhkConvexShape" module="BSHavok" versions="#BETHESDA#">
         A sphere.
     </niobject>
 
-    <niobject name="bhkCylinderShape" inherit="bhkConvexShape" versions="#BETHESDA#">
+    <niobject name="bhkCylinderShape" inherit="bhkConvexShape" module="BSHavok" versions="#BETHESDA#">
         A cylinder.
         <add name="Unused 01" type="byte" arr1="8" binary="true" />
         <add name="Vertex A" type="Vector4" />
@@ -2919,7 +2933,7 @@
         <add name="Unused 02" type="byte" arr1="12" binary="true" />
     </niobject>
 
-    <niobject name="bhkCapsuleShape" inherit="bhkConvexShape" versions="#BETHESDA#">
+    <niobject name="bhkCapsuleShape" inherit="bhkConvexShape" module="BSHavok" versions="#BETHESDA#">
         A capsule.
         <add name="Unused 01" type="byte" arr1="8" binary="true" />
         <add name="First Point" type="Vector3">First point on the capsule's axis.</add>
@@ -2928,14 +2942,14 @@
         <add name="Radius 2" type="float">Matches second capsule radius.</add>
     </niobject>
 
-    <niobject name="bhkBoxShape" inherit="bhkConvexShape" versions="#BETHESDA#">
+    <niobject name="bhkBoxShape" inherit="bhkConvexShape" module="BSHavok" versions="#BETHESDA#">
         A box.
         <add name="Unused 01" type="byte" arr1="8" binary="true" />
         <add name="Dimensions" type="Vector3">A cube stored in Half Extents. A unit cube (1.0, 1.0, 1.0) would be stored as 0.5, 0.5, 0.5.</add>
         <add name="Unused Float" type="float">Unused as Havok stores the Half Extents as hkVector4 with the W component unused.</add>
     </niobject>
 
-    <niobject name="bhkConvexVerticesShape" inherit="bhkConvexShape" versions="#BETHESDA#">
+    <niobject name="bhkConvexVerticesShape" inherit="bhkConvexShape" module="BSHavok" versions="#BETHESDA#">
         A convex shape built from vertices. Note that if the shape is used in
         a non-static object (such as clutter), then they will simply fall
         through ground when they are under a bhkListShape.
@@ -2947,7 +2961,7 @@
         <add name="Normals" type="Vector4" arr1="Num Normals">Half spaces as determined by the set of vertices above. First three components define the normal pointing to the exterior, fourth component is the signed distance of the separating plane to the origin: it is minus the dot product of v and n, where v is any vertex on the separating plane, and n is the normal. Lexicographically sorted.</add>
     </niobject>
 
-    <niobject name="bhkConvexTransformShape" inherit="bhkConvexShapeBase" versions="#BETHESDA#">
+    <niobject name="bhkConvexTransformShape" inherit="bhkConvexShapeBase" module="BSHavok" versions="#BETHESDA#">
         Contains a bhkConvexShape and an additional transform for that shape.
         The advantage of using bhkConvexTransformShape over bhkTransformShape is that it does not require additional agents to be created as it is itself convex.
         <add name="Shape" type="Ref" template="bhkConvexShape">The shape that this object transforms.</add>
@@ -2957,14 +2971,14 @@
         <add name="Transform" type="Matrix44">A transform matrix.</add>
     </niobject>
 
-    <niobject name="bhkConvexSweepShape" inherit="bhkConvexShapeBase" versions="V10_0_1_0">
+    <niobject name="bhkConvexSweepShape" inherit="bhkConvexShapeBase" module="BSHavok" versions="V10_0_1_0">
         <add name="Shape" type="Ref" template="bhkConvexShape" />
         <add name="Material" type="HavokMaterial" />
         <add name="Radius" type="float" />
         <add name="Unknown" type="Vector3" />
     </niobject>
 
-    <niobject name="bhkMultiSphereShape" inherit="bhkSphereRepShape" versions="#BETHESDA#">
+    <niobject name="bhkMultiSphereShape" inherit="bhkSphereRepShape" module="BSHavok" versions="#BETHESDA#">
         A compound shape made up of spheres. This is useful as an approximation for complex shapes, as collision detection for spheres is very fast.
         However, if two bhkMultiSphereShape collide, every sphere needs to be checked against every other sphere.
             Example: 10 spheres colliding with 10 spheres will result in 100 collision checks.
@@ -2974,7 +2988,7 @@
         <add name="Spheres" type="NiBound" arr1="Num Spheres">The spheres which make up the multi sphere shape. Max of 8.</add>
     </niobject>
 
-    <niobject name="bhkBvTreeShape" abstract="true" inherit="bhkShape" versions="#BETHESDA#">
+    <niobject name="bhkBvTreeShape" abstract="true" inherit="bhkShape" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpBvTreeShape. hkpBvTreeShape adds a bounding volume tree to an hkpShapeCollection.
         A bounding volume tree is useful for testing collision between a moving object and large static geometry.
         <add name="Shape" type="Ref" template="bhkShape">The shape.</add>
@@ -2991,7 +3005,7 @@
         <add name="Data" type="byte" binary="true" arr1="Data Size">The tree of bounding volume data.</add>
     </compound>
 
-    <niobject name="bhkMoppBvTreeShape" inherit="bhkBvTreeShape" versions="#BETHESDA#">
+    <niobject name="bhkMoppBvTreeShape" inherit="bhkBvTreeShape" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpMoppBvTreeShape. hkpMoppBvTreeShape is a bounding volume tree using Havok-proprietary MOPP code.
         <add name="Unused 01" type="byte" arr1="12" binary="true" />
         <add name="Scale" type="float" default="1.0" />
@@ -2999,11 +3013,11 @@
     </niobject>
 
 
-    <niobject name="bhkShapeCollection" abstract="true" inherit="bhkShape" versions="#BETHESDA#">
+    <niobject name="bhkShapeCollection" abstract="true" inherit="bhkShape" module="BSHavok" versions="#BETHESDA#">
         An interface to a collection of bhkShapes.
     </niobject>
 
-    <niobject name="bhkListShape" inherit="bhkShapeCollection" versions="#BETHESDA#">
+    <niobject name="bhkListShape" inherit="bhkShapeCollection" module="BSHavok" versions="#BETHESDA#">
         A list of shapes.
 
         Shapes collected in a bhkListShape may not have the correct collision sound/FX due to HavokMaterial issues.
@@ -3017,7 +3031,7 @@
         <add name="Filters" type="HavokFilter" arr1="Num Filters">Always zeroed. Seemingly unused, or 0 for all values means no override.</add>
     </niobject>
 
-    <niobject name="bhkMeshShape" inherit="bhkShape" versions="V10_0_1_0">
+    <niobject name="bhkMeshShape" inherit="bhkShape" module="BSHavok" versions="V10_0_1_0">
         Bethesda extension of hkpMeshShape, but using NiTriStripsData instead of Havok storage.
         Appears in one old Oblivion NIF, but only in certain distributions. NIF version 10.0.1.0 only.
         <add name="Unknown 01" type="uint" arr1="2" />
@@ -3031,7 +3045,7 @@
         <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data" ver2="10.0.1.0" />
     </niobject>
 
-    <niobject name="bhkPackedNiTriStripsShape" inherit="bhkShapeCollection" versions="#BETHESDA#">
+    <niobject name="bhkPackedNiTriStripsShape" inherit="bhkShapeCollection" module="BSHavok" versions="#BETHESDA#">
         Bethesda custom hkpShapeCollection using custom packed tri strips data.
         <add name="Num Sub Shapes" type="ushort" ver2="20.0.0.5" />
         <add name="Sub Shapes" type="hkSubPartData" arr1="Num Sub Shapes" ver2="20.0.0.5" />
@@ -3045,7 +3059,7 @@
         <add name="Data" type="Ref" template="hkPackedNiTriStripsData" />
     </niobject>
 
-    <niobject name="bhkNiTriStripsShape" inherit="bhkShapeCollection" versions="#BETHESDA#">
+    <niobject name="bhkNiTriStripsShape" inherit="bhkShapeCollection" module="BSHavok" versions="#BETHESDA#">
         Bethesda custom hkpShapeCollection using NiTriStripsData for geometry storage.
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float" default="0.1" />
@@ -3058,7 +3072,7 @@
         <add name="Filters" type="HavokFilter" arr1="Num Filters" />
     </niobject>
 
-    <niobject name="NiExtraData" inherit="NiObject">
+    <niobject name="NiExtraData" inherit="NiObject" module="NiMain">
         A generic extra data object.
         <add name="Name" type="string" ver1="10.0.1.0" excludeT="BSExtraData">Name of this object.</add>
         <add name="Next Extra Data" type="Ref" template="NiExtraData" ver2="4.2.2.0">Block number of the next extra data object.</add>
@@ -3066,33 +3080,33 @@
         <add name="Num Bytes" type="uint" ver1="4.0.0.0" ver2="4.2.2.0">Ignore binary data after 4.x as the child block will cover it.</add>
     </niobject>
 
-    <niobject name="NiInterpolator" abstract="true" inherit="NiObject">
+    <niobject name="NiInterpolator" abstract="true" inherit="NiObject" module="NiAnimation">
         Abstract base class for all interpolators of bool, float, NiQuaternion, NiPoint3, NiColorA, and NiQuatTransform data.
     </niobject>
 
-    <niobject name="NiKeyBasedInterpolator" abstract="true" inherit="NiInterpolator">
+    <niobject name="NiKeyBasedInterpolator" abstract="true" inherit="NiInterpolator" module="NiAnimation">
         Abstract base class for interpolators that use NiAnimationKeys (Key, KeyGrp) for interpolation.
     </niobject>
 
-    <niobject name="NiColorInterpolator" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiColorInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         Animates a color value over time.
         <add name="Value" type="Color4" default="#INV_VEC4#" />
         <add name="Data" type="Ref" template="NiColorData" />
     </niobject>
 
-    <niobject name="NiFloatInterpolator" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiFloatInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         Uses NiFloatKeys to animate a float value over time.
         <add name="Value" type="float" default="#INV_FLT#">Pose value if lacking NiFloatData.</add>
         <add name="Data" type="Ref" template="NiFloatData" />
     </niobject>
 
-    <niobject name="NiTransformInterpolator" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiTransformInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         An interpolator for transform keyframes.
         <add name="Transform" type="NiQuatTransform" />
         <add name="Data" type="Ref" template="NiTransformData" />
     </niobject>
 
-    <niobject name="NiPoint3Interpolator" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiPoint3Interpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         Uses NiPosKeys to animate an NiPoint3 value over time.
         <add name="Value" type="Vector3" default="#INV_VEC3#">Pose value if lacking NiPosData.</add>
         <add name="Data" type="Ref" template="NiPosData" />
@@ -3108,7 +3122,7 @@
         <option value="6" name="Flip" />
     </bitflags>
 
-    <niobject name="NiPathInterpolator" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiPathInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         Used to make an object follow a predefined spline path.
         <add name="Flags" type="PathFlags" default="3" />
         <add name="Bank Dir" type="int" default="1">-1 = Negative, 1 = Positive</add>
@@ -3119,13 +3133,13 @@
         <add name="Percent Data" type="Ref" template="NiFloatData" />
     </niobject>
 
-    <niobject name="NiBoolInterpolator" inherit="NiKeyBasedInterpolator">
+    <niobject name="NiBoolInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         Uses NiBoolKeys to animate a bool value over time.
         <add name="Value" type="bool" default="2">Pose value if lacking NiBoolData.</add>
         <add name="Data" type="Ref" template="NiBoolData" />
     </niobject>
 
-    <niobject name="NiBoolTimelineInterpolator" inherit="NiBoolInterpolator">
+    <niobject name="NiBoolTimelineInterpolator" inherit="NiBoolInterpolator" module="NiAnimation">
         Uses NiBoolKeys to animate a bool value over time.
         Unlike NiBoolInterpolator, it ensures that keys have not been missed between two updates.
     </niobject>
@@ -3144,7 +3158,7 @@
         <add name="Ease Spinner" type="float" />
     </compound>
 
-    <niobject name="NiBlendInterpolator" abstract="true" inherit="NiInterpolator">
+    <niobject name="NiBlendInterpolator" abstract="true" inherit="NiInterpolator" module="NiAnimation">
         Abstract base class for all NiInterpolators that blend the results of sub-interpolators together to compute a final weighted value.
         <add name="Flags" type="InterpBlendFlags" ver1="10.1.0.112" />
         <add name="Array Size" type="ushort" ver2="10.1.0.109" />
@@ -3178,7 +3192,7 @@
         <add name="Next High Priority" type="char" default="#CHAR_MIN#" ver1="10.1.0.110" ver2="10.1.0.111" />
     </niobject>
 
-    <niobject name="NiBSplineInterpolator" abstract="true" inherit="NiInterpolator">
+    <niobject name="NiBSplineInterpolator" abstract="true" inherit="NiInterpolator" module="NiAnimation">
         Abstract base class for interpolators storing data via a B-spline.
         <add name="Start Time" type="float" default="#FLT_MAX#">Animation start time.</add>
         <add name="Stop Time" type="float" default="#FLT_MIN#">Animation stop time.</add>
@@ -3195,7 +3209,7 @@
         <add name="Unknown Byte 1" type="byte" />
     </compound>
 
-    <niobject name="NiObjectNET" abstract="true" inherit="NiObject">
+    <niobject name="NiObjectNET" abstract="true" inherit="NiObject" module="NiMain">
         Abstract base class for NiObjects that support names, extra data, and time controllers.
         <add name="Skyrim Shader Type" type="BSLightingShaderPropertyShaderType" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SKY#" onlyT="BSLightingShaderProperty">Configures the main shader path</add>
         <add name="Name" type="string">Name of this controllable object, used to refer to the object in .kf files.</add>
@@ -3206,7 +3220,7 @@
         <add name="Controller" type="Ref" template="NiTimeController" ver1="3.0">Controller object index. (The first in a chain)</add>
     </niobject>
 
-    <niobject name="NiCollisionObject" inherit="NiObject">
+    <niobject name="NiCollisionObject" inherit="NiObject" module="NiMain">
         This is the most common collision object found in NIF files. It acts as a real object that
         is visible and possibly (if the body allows for it) interactive. The node itself
         is simple, it only has three properties.
@@ -3214,7 +3228,7 @@
         <add name="Target" type="Ptr" template="NiAVObject">Index of the AV object referring to this collision object.</add>
     </niobject>
 
-    <niobject name="NiCollisionData" inherit="NiCollisionObject">
+    <niobject name="NiCollisionData" inherit="NiCollisionObject" module="NiMain">
         Collision box.
         <add name="Propagation Mode" type="PropagationMode" />
         <add name="Collision Mode" type="CollisionMode" ver1="10.1.0.0" />
@@ -3235,7 +3249,7 @@
         <option value="11" name="DISMEMBERED_LIMB" />
     </bitflags>
 
-    <niobject name="bhkNiCollisionObject" abstract="true" inherit="NiCollisionObject">
+    <niobject name="bhkNiCollisionObject" abstract="true" inherit="NiCollisionObject" module="BSHavok">
         Havok related collision object?
         <add name="Flags" type="bhkCOFlags" default="1">
             Set to 1 for most objects, and to 41 for animated objects (ANIM_STATIC). Bits: 0=Active 2=Notify 3=Set Local 6=Reset.
@@ -3243,11 +3257,11 @@
         <add name="Body" type="Ref" template="bhkWorldObject" />
     </niobject>
 
-    <niobject name="bhkCollisionObject" inherit="bhkNiCollisionObject">
+    <niobject name="bhkCollisionObject" inherit="bhkNiCollisionObject" module="BSHavok">
         Havok related collision object?
     </niobject>
 
-    <niobject name="bhkBlendCollisionObject" inherit="bhkCollisionObject">
+    <niobject name="bhkBlendCollisionObject" inherit="bhkCollisionObject" module="BSHavok">
         Unknown.
         <add name="Heir Gain" type="float" default="1.0" />
         <add name="Vel Gain" type="float" default="1.0" />
@@ -3255,15 +3269,15 @@
         <add name="Unknown Float 2" type="float" vercond="#BSVER# #LT# 9" />
     </niobject>
 
-    <niobject name="bhkPCollisionObject" inherit="bhkNiCollisionObject">
+    <niobject name="bhkPCollisionObject" inherit="bhkNiCollisionObject" module="BSHavok">
         Unknown.
     </niobject>
 
-    <niobject name="bhkSPCollisionObject" inherit="bhkPCollisionObject">
+    <niobject name="bhkSPCollisionObject" inherit="bhkPCollisionObject" module="BSHavok">
         Unknown.
     </niobject>
 
-    <niobject name="NiAVObject" abstract="true" inherit="NiObjectNET">
+    <niobject name="NiAVObject" abstract="true" inherit="NiObjectNET" module="NiMain">
         Abstract audio-visual base class from which all of Gamebryo's scene graph objects inherit.
         <add name="Flags" type="uint" default="524302" vercond="#BSVER# #GT# 26">Basic flags for AV objects. For Bethesda streams above 26 only.</add>
         <add name="Flags" type="ushort" ver1="3.0" vercond="#BSVER# #LTE# 26">Basic flags for AV objects; commonly 0x000C or 0x000A.</add>
@@ -3280,7 +3294,7 @@
         <add name="Collision Object" type="Ref" template="NiCollisionObject" ver1="10.0.1.0" />
     </niobject>
 
-    <niobject name="NiDynamicEffect" abstract="true" inherit="NiAVObject">
+    <niobject name="NiDynamicEffect" abstract="true" inherit="NiAVObject" module="NiMain">
         Abstract base class for dynamic effects such as NiLights or projected texture effects.
         <add name="Switch State" type="bool" default="1" ver1="10.1.0.106" vercond="#NI_BS_LT_FO4#">If true, then the dynamic effect is applied to affected nodes during rendering.</add>
         <add name="Num Affected Nodes" type="uint" ver2="4.0.0.2" />
@@ -3290,7 +3304,7 @@
         <add name="Affected Nodes" type="Ptr" template="NiNode" arr1="Num Affected Nodes" ver1="10.1.0.0" vercond="#NI_BS_LT_FO4#">If a node appears in this list, then its entire subtree will be affected by the effect.</add>
     </niobject>
 
-    <niobject name="NiLight" abstract="true" inherit="NiDynamicEffect">
+    <niobject name="NiLight" abstract="true" inherit="NiDynamicEffect" module="NiMain">
         Abstract base class that represents light sources in a scene graph.
         For Bethesda Stream 130 (FO4), NiLight now directly inherits from NiAVObject.
         <add name="Dimmer" type="float" default="1.0">Scales the overall brightness of all light components.</add>
@@ -3299,16 +3313,16 @@
         <add name="Specular Color" type="Color3" default="#VEC3_ZERO#" />
     </niobject>
 
-    <niobject name="NiProperty" abstract="true" inherit="NiObjectNET">
+    <niobject name="NiProperty" abstract="true" inherit="NiObjectNET" module="NiMain">
         Abstract base class representing all rendering properties. Subclasses are attached to NiAVObjects to control their rendering.
     </niobject>
 
-    <niobject name="NiTransparentProperty" inherit="NiProperty">
+    <niobject name="NiTransparentProperty" inherit="NiProperty" module="NiLegacy">
         Unknown
         <add name="Unknown" type="byte" arr1="6" />
     </niobject>
 
-    <niobject name="NiPSysModifier" abstract="true" inherit="NiObject">
+    <niobject name="NiPSysModifier" abstract="true" inherit="NiObject" module="NiParticle">
         Abstract base class for all particle system modifiers.
         <add name="Name" type="string">Used to locate the modifier.</add>
         <add name="Order" type="uint">Modifier ID in the particle modifier chain (always a multiple of 1000)?</add>
@@ -3316,7 +3330,7 @@
         <add name="Active" type="bool" default="1">Whether or not the modifier is active.</add>
     </niobject>
 
-    <niobject name="NiPSysEmitter" abstract="true" inherit="NiPSysModifier">
+    <niobject name="NiPSysEmitter" abstract="true" inherit="NiPSysModifier" module="NiParticle">
         Abstract base class for all particle system emitters.
         <add name="Speed" type="float">Speed / Inertia of particle movement.</add>
         <add name="Speed Variation" type="float">Adds an amount of randomness to Speed.</add>
@@ -3331,12 +3345,12 @@
         <add name="Life Span Variation" type="float">Adds randomness to Life Span.</add>
     </niobject>
 
-    <niobject name="NiPSysVolumeEmitter" abstract="true" inherit="NiPSysEmitter">
+    <niobject name="NiPSysVolumeEmitter" abstract="true" inherit="NiPSysEmitter" module="NiParticle">
         Abstract base class for particle emitters that emit particles from a volume.
         <add name="Emitter Object" type="Ptr" template="NiNode" ver1="10.1.0.0">Node parent of this modifier?</add>
     </niobject>
 
-    <niobject name="NiTimeController" abstract="true" inherit="NiObject">
+    <niobject name="NiTimeController" abstract="true" inherit="NiObject" module="NiMain">
         Abstract base class that provides the base timing and update functionality for all the Gamebryo animation controllers.
         <add name="Next Controller" type="Ref" template="NiTimeController">Index of the next controller.</add>
         <add name="Flags" type="TimeControllerFlags" default="76" />
@@ -3349,18 +3363,18 @@
     </niobject>
 
 
-    <niobject name="NiInterpController" abstract="true" inherit="NiTimeController">
+    <niobject name="NiInterpController" abstract="true" inherit="NiTimeController" module="NiAnimation">
         Abstract base class for all NiTimeController objects using NiInterpolator objects to animate their target objects.
         <add name="Manager Controlled" type="bool" ver1="10.1.0.104" ver2="10.1.0.108" />
     </niobject>
 
-    <niobject name="NiMultiTargetTransformController" inherit="NiInterpController">
+    <niobject name="NiMultiTargetTransformController" inherit="NiInterpController" module="NiAnimation">
         DEPRECATED (20.6)
         <add name="Num Extra Targets" type="ushort">The number of target pointers that follow.</add>
         <add name="Extra Targets" type="Ptr" template="NiAVObject" arr1="Num Extra Targets">NiNode Targets to be controlled.</add>
     </niobject>
 
-    <niobject name="NiGeomMorpherController" inherit="NiInterpController">
+    <niobject name="NiGeomMorpherController" inherit="NiInterpController" module="NiAnimation">
         DEPRECATED (20.5), replaced by NiMorphMeshModifier.
         Time controller for geometry morphing.
         <add name="Extra Flags" type="GeomMorpherFlags" ver1="10.0.1.2" />
@@ -3373,31 +3387,31 @@
         <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" ver1="10.2.0.0" ver2="20.0.0.5" vercond="#BSVER# #GT# 9" />
     </niobject>
 
-    <niobject name="NiMorphController" inherit="NiInterpController">
+    <niobject name="NiMorphController" inherit="NiInterpController" module="NiLegacy" until="V10_0_1_0">
         Unknown! Used by Daoc->'healing.nif'.
     </niobject>
 
-    <niobject name="NiMorpherController" inherit="NiInterpController">
+    <niobject name="NiMorpherController" inherit="NiInterpController" module="NiAnimation">
         Unknown! Used by Daoc.
         <add name="Data" type="Ref" template="NiMorphData">This controller's data.</add>
     </niobject>
 
-    <niobject name="NiSingleInterpController" abstract="true" inherit="NiInterpController">
+    <niobject name="NiSingleInterpController" abstract="true" inherit="NiInterpController" module="NiAnimation">
         Uses a single NiInterpolator to animate its target value.
         <add name="Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.104" />
     </niobject>
 
-    <niobject name="NiKeyframeController" inherit="NiSingleInterpController">
+    <niobject name="NiKeyframeController" inherit="NiSingleInterpController" module="NiAnimation">
         DEPRECATED (10.2), RENAMED (10.2) to NiTransformController
         A time controller object for animation key frames.
         <add name="Data" type="Ref" template="NiKeyframeData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiTransformController" inherit="NiKeyframeController">
+    <niobject name="NiTransformController" inherit="NiKeyframeController" module="NiAnimation">
         NiTransformController replaces NiKeyframeController.
     </niobject>
 
-    <niobject name="NiPSysModifierCtlr" abstract="true" inherit="NiSingleInterpController">
+    <niobject name="NiPSysModifierCtlr" abstract="true" inherit="NiSingleInterpController" module="NiParticle">
         A particle system modifier controller.
         NiInterpController::GetCtlrID() string format:
             '%s'
@@ -3405,7 +3419,7 @@
         <add name="Modifier Name" type="string">Used to find the modifier pointer.</add>
     </niobject>
 
-    <niobject name="NiPSysEmitterCtlr" inherit="NiPSysModifierCtlr">
+    <niobject name="NiPSysEmitterCtlr" inherit="NiPSysModifierCtlr" module="NiParticle">
         Particle system emitter controller.
         NiInterpController::GetInterpolatorID() string format:
             ['BirthRate', 'EmitterActive'] (for "Interpolator" and "Visibility Interpolator" respectively)
@@ -3413,50 +3427,50 @@
         <add name="Visibility Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.104" />
     </niobject>
 
-    <niobject name="NiPSysModifierBoolCtlr" abstract="true" inherit="NiPSysModifierCtlr">
+    <niobject name="NiPSysModifierBoolCtlr" abstract="true" inherit="NiPSysModifierCtlr" module="NiParticle">
         A particle system modifier controller that animates a boolean value for particles.
     </niobject>
 
-    <niobject name="NiPSysModifierActiveCtlr" inherit="NiPSysModifierBoolCtlr">
+    <niobject name="NiPSysModifierActiveCtlr" inherit="NiPSysModifierBoolCtlr" module="NiParticle">
         A particle system modifier controller that animates active/inactive state for particles.
         <add name="Data" type="Ref" template="NiVisData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiPSysModifierFloatCtlr" abstract="true" inherit="NiPSysModifierCtlr">
+    <niobject name="NiPSysModifierFloatCtlr" abstract="true" inherit="NiPSysModifierCtlr" module="NiParticle">
         A particle system modifier controller that animates a floating point value for particles.
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiPSysEmitterDeclinationCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterDeclinationCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Animates the declination value on an NiPSysEmitter object.
     </niobject>
 
-    <niobject name="NiPSysEmitterDeclinationVarCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterDeclinationVarCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Animates the declination variation value on an NiPSysEmitter object.
     </niobject>
 
-    <niobject name="NiPSysEmitterInitialRadiusCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterInitialRadiusCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Animates the size value on an NiPSysEmitter object.
     </niobject>
 
-    <niobject name="NiPSysEmitterLifeSpanCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterLifeSpanCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Animates the lifespan value on an NiPSysEmitter object.
     </niobject>
 
-    <niobject name="NiPSysEmitterSpeedCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterSpeedCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Animates the speed value on an NiPSysEmitter object.
     </niobject>
 
-    <niobject name="NiPSysGravityStrengthCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysGravityStrengthCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Animates the strength value of an NiPSysGravityModifier.
     </niobject>
 
 
-    <niobject name="NiFloatInterpController" abstract="true" inherit="NiSingleInterpController">
+    <niobject name="NiFloatInterpController" abstract="true" inherit="NiSingleInterpController" module="NiAnimation">
         Abstract base class for all NiInterpControllers that use an NiInterpolator to animate their target float value.
     </niobject>
 
-    <niobject name="NiFlipController" inherit="NiFloatInterpController">
+    <niobject name="NiFlipController" inherit="NiFloatInterpController" module="NiAnimation">
         Changes the image a Map (TexDesc) will use. Uses a float interpolator to animate the texture index.
         Often used for performing flipbook animation.
         <add name="Texture Slot" type="TexType">Target texture slot (0=base, 4=glow).</add>
@@ -3470,12 +3484,12 @@
         <add name="Images" type="Ref" template="NiImage" arr1="Num Sources" ver2="3.1">The image sources</add>
     </niobject>
 
-    <niobject name="NiAlphaController" inherit="NiFloatInterpController">
+    <niobject name="NiAlphaController" inherit="NiFloatInterpController" module="NiAnimation">
         Animates the alpha value of a property using an interpolator.
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiTextureTransformController" inherit="NiFloatInterpController">
+    <niobject name="NiTextureTransformController" inherit="NiFloatInterpController" module="NiAnimation">
         Used to animate a single member of an NiTextureTransform.
         NiInterpController::GetCtlrID() string formats:
             ['%1-%2-TT_TRANSLATE_U', '%1-%2-TT_TRANSLATE_V', '%1-%2-TT_ROTATE', '%1-%2-TT_SCALE_U', '%1-%2-TT_SCALE_V']
@@ -3486,24 +3500,24 @@
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiLightDimmerController" inherit="NiFloatInterpController">
-        Unknown controller.
+    <niobject name="NiLightDimmerController" inherit="NiFloatInterpController" module="NiAnimation">
+        Animates the dimmer value of an NiLight.
     </niobject>
 
-    <niobject name="NiBoolInterpController" abstract="true" inherit="NiSingleInterpController">
+    <niobject name="NiBoolInterpController" abstract="true" inherit="NiSingleInterpController" module="NiAnimation">
         Abstract base class for all NiInterpControllers that use a NiInterpolator to animate their target boolean value.
     </niobject>
 
-    <niobject name="NiVisController" inherit="NiBoolInterpController">
+    <niobject name="NiVisController" inherit="NiBoolInterpController" module="NiAnimation">
         Animates the visibility of an NiAVObject.
         <add name="Data" type="Ref" template="NiVisData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiPoint3InterpController" abstract="true" inherit="NiSingleInterpController">
+    <niobject name="NiPoint3InterpController" abstract="true" inherit="NiSingleInterpController" module="NiAnimation">
         Abstract base class for all NiInterpControllers that use an NiInterpolator to animate their target NiPoint3 value.
     </niobject>
 
-    <niobject name="NiMaterialColorController" inherit="NiPoint3InterpController">
+    <niobject name="NiMaterialColorController" inherit="NiPoint3InterpController" module="NiAnimation">
         Time controller for material color. Flags are used for color selection in versions below 10.1.0.0.
         Bits 4-5: Target Color (00 = Ambient, 01 = Diffuse, 10 = Specular, 11 = Emissive)
         NiInterpController::GetCtlrID() string formats:
@@ -3512,7 +3526,7 @@
         <add name="Data" type="Ref" template="NiPosData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiLightColorController" inherit="NiPoint3InterpController">
+    <niobject name="NiLightColorController" inherit="NiPoint3InterpController" module="NiAnimation">
         Animates the ambient, diffuse and specular colors of an NiLight.
         NiInterpController::GetCtlrID() string formats:
             ['Diffuse', 'Ambient'] (Depending on "Target Color")
@@ -3521,7 +3535,7 @@
     </niobject>
 
 
-    <niobject name="NiExtraDataController" abstract="true" inherit="NiSingleInterpController">
+    <niobject name="NiExtraDataController" abstract="true" inherit="NiSingleInterpController" module="NiAnimation">
         Abstract base class for all extra data controllers.
         NiInterpController::GetCtlrID() string format:
             '%s'
@@ -3529,11 +3543,11 @@
         <add name="Extra Data Name" type="string" ver1="10.2.0.0" />
     </niobject>
 
-    <niobject name="NiColorExtraDataController" inherit="NiExtraDataController">
+    <niobject name="NiColorExtraDataController" inherit="NiExtraDataController" module="NiAnimation">
         Animates an NiColorExtraData object attached to an NiAVObject.
     </niobject>
 
-    <niobject name="NiFloatExtraDataController" inherit="NiExtraDataController">
+    <niobject name="NiFloatExtraDataController" inherit="NiExtraDataController" module="NiAnimation">
         Animates an NiFloatExtraData object attached to an NiAVObject.
         NiInterpController::GetCtlrID() string format is same as parent.
         <add name="Num Extra Bytes" type="byte" ver2="10.1.0.0">Number of extra bytes.</add>
@@ -3542,7 +3556,7 @@
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiFloatsExtraDataController" inherit="NiExtraDataController">
+    <niobject name="NiFloatsExtraDataController" inherit="NiExtraDataController" module="NiAnimation">
         Animates an NiFloatsExtraData object attached to an NiAVObject.
         NiInterpController::GetCtlrID() string format:
             '%s[%d]'
@@ -3551,7 +3565,7 @@
         <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
-    <niobject name="NiFloatsExtraDataPoint3Controller" inherit="NiExtraDataController">
+    <niobject name="NiFloatsExtraDataPoint3Controller" inherit="NiExtraDataController" module="NiAnimation">
         Animates an NiFloatsExtraData object attached to an NiAVObject.
         NiInterpController::GetCtlrID() string format:
             '%s[%d]'
@@ -3559,7 +3573,7 @@
         <add name="Floats Extra Data Index" type="int" />
     </niobject>
 
-    <niobject name="NiBoneLODController" inherit="NiTimeController">
+    <niobject name="NiBoneLODController" inherit="NiTimeController" module="NiAnimation">
         DEPRECATED (20.5), Replaced by NiSkinningLODController.
         Level of detail controller for bones.  Priority is arranged from low to high.
         <add name="LOD" type="uint" />
@@ -3572,7 +3586,7 @@
         <add name="Shape Groups 2" type="Ref" template="NiTriBasedGeom" arr1="Num Shape Groups 2" ver1="4.2.2.0" vercond="#NISTREAM#">Group of NiTriShape indices.</add>
     </niobject>
 
-    <niobject name="NiBSBoneLODController" inherit="NiBoneLODController">
+    <niobject name="NiBSBoneLODController" inherit="NiBoneLODController" module="BSAnimation">
         A simple LOD controller for bones.
     </niobject>
     
@@ -3589,7 +3603,7 @@
         <add name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</add>
     </compound>
 
-    <niobject name="NiGeometry" abstract="true" inherit="NiAVObject">
+    <niobject name="NiGeometry" abstract="true" inherit="NiAVObject" module="NiMain">
         Describes a visible scene element with vertices like a mesh, a particle system, lines, etc.
             Bethesda 20.2.0.7 NIFs: NiGeometry was changed to BSGeometry. 
             Most new blocks (e.g. BSTriShape) do not refer to NiGeometry except NiParticleSystem was changed to use BSGeometry.
@@ -3607,11 +3621,11 @@
         <add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
     </niobject>
 
-    <niobject name="NiTriBasedGeom" abstract="true" inherit="NiGeometry">
+    <niobject name="NiTriBasedGeom" abstract="true" inherit="NiGeometry" module="NiMain">
         Describes a mesh, built from triangles.
     </niobject>
 
-    <niobject name="NiGeometryData" abstract="true" inherit="NiObject">
+    <niobject name="NiGeometryData" abstract="true" inherit="NiObject" module="NiMain">
         Mesh data: vertices, vertex normals, etc.
             Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly. 
             "Num Vertices" is renamed to "BS Max Vertices" for Bethesda 20.2 because Vertices, Normals, Tangents, Colors, and UV arrays
@@ -3654,46 +3668,46 @@
         <add name="Additional Data" type="Ref" template="AbstractAdditionalGeometryData" ver1="20.0.0.4" />
     </niobject>
 
-    <niobject name="AbstractAdditionalGeometryData" abstract="true" inherit="NiObject">
+    <niobject name="AbstractAdditionalGeometryData" abstract="true" inherit="NiObject" module="NiMain">
     </niobject>
 
-    <niobject name="NiTriBasedGeomData" abstract="true" inherit="NiGeometryData">
+    <niobject name="NiTriBasedGeomData" abstract="true" inherit="NiGeometryData" module="NiMain">
         Describes a mesh, built from triangles.
         <add name="Num Triangles" type="ushort">Number of triangles.</add>
     </niobject>
 
-    <niobject name="bhkBlendController" inherit="NiTimeController">
+    <niobject name="bhkBlendController" inherit="NiTimeController" module="BSHavok">
         Unknown. Is apparently only used in skeleton.nif files.
         <add name="Keys" type="uint">Seems to be always zero.</add>
     </niobject>
 
-    <niobject name="BSBound" inherit="NiExtraData" versions="#BETHESDA#">
+    <niobject name="BSBound" inherit="NiExtraData" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific collision bounding box for skeletons.
         <add name="Center" type="Vector3">Center of the bounding box.</add>
         <add name="Dimensions" type="Vector3">Dimensions of the bounding box from center.</add>
     </niobject>
 
-    <niobject name="BSFurnitureMarker" inherit="NiExtraData" versions="#BETHESDA#">
+    <niobject name="BSFurnitureMarker" inherit="NiExtraData" module="BSMain" versions="#BETHESDA#">
         Unknown. Marks furniture sitting positions?
         <add name="Num Positions" type="uint" />
         <add name="Positions" type="FurniturePosition" arr1="Num Positions" />
     </niobject>
 
-    <niobject name="BSParentVelocityModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
-        Particle modifier that adds a blend of object space translation and rotation to particles born in world space.
+    <niobject name="BSParentVelocityModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
+        Particle modifier that adds a percentage of object space translation and rotation to particles born in world space.
         <add name="Damping" type="float">Amount of blending?</add>
     </niobject>
 
-    <niobject name="BSPSysArrayEmitter" inherit="NiPSysVolumeEmitter" versions="#BETHESDA#">
+    <niobject name="BSPSysArrayEmitter" inherit="NiPSysVolumeEmitter" module="BSParticle" versions="#BETHESDA#">
         Particle emitter that uses a node, its children and subchildren to emit from.  Emission will be evenly spread along points from nodes leading to their direct parents/children only.
     </niobject>
 
-    <niobject name="BSWindModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
+    <niobject name="BSWindModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
         Particle Modifier that uses the wind value from the gamedata to alter the path of particles.
         <add name="Strength" type="float" default="0.25">The amount of force wind will have on particles.</add>
     </niobject>
 
-    <niobject name="hkPackedNiTriStripsData" inherit="bhkShapeCollection" versions="#BETHESDA#">
+    <niobject name="hkPackedNiTriStripsData" inherit="bhkShapeCollection" module="BSHavok" versions="#BETHESDA#">
         Bethesda custom tri strips data block for bhkPackedNiTriStripsShape.
         <add name="Num Triangles" type="uint" />
         <add name="Triangles" type="TriangleData" arr1="Num Triangles" />
@@ -3707,7 +3721,7 @@
         <add name="Sub Shapes" type="hkSubPartData" arr1="Num Sub Shapes" ver1="20.2.0.7" />
     </niobject>
 
-    <niobject name="NiAlphaProperty" inherit="NiProperty">
+    <niobject name="NiAlphaProperty" inherit="NiProperty" module="NiMain">
         Transparency. Flags 0x00ED.
         <add name="Flags" type="AlphaFlags" default="4844" />
         <add name="Threshold" type="byte" default="128">Threshold for alpha testing (see: glAlphaFunc)</add>
@@ -3715,11 +3729,11 @@
         <add name="Unknown Int 2" type="uint" ver2="2.3" />
     </niobject>
 
-    <niobject name="NiAmbientLight" inherit="NiLight">
+    <niobject name="NiAmbientLight" inherit="NiLight" module="NiMain">
         Ambient light source.
     </niobject>
 
-    <niobject name="NiParticlesData" inherit="NiGeometryData">
+    <niobject name="NiParticlesData" inherit="NiGeometryData" module="NiMain">
         Generic rotating particles data object.
         Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly.
         <add name="Num Particles" type="ushort" ver2="4.0.0.2">The maximum number of particles (matches the number of vertices).</add>
@@ -3747,13 +3761,13 @@
         <add name="Speed to Aspect Speed 2" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
     </niobject>
 
-    <niobject name="NiRotatingParticlesData" inherit="NiParticlesData" until="V10_0_1_0">
+    <niobject name="NiRotatingParticlesData" inherit="NiParticlesData" module="NiLegacy" until="V10_0_1_0">
         Rotating particles data object.
         <add name="Has Rotations 2" type="bool" ver2="4.2.2.0">Is the particle rotation array present?</add>
         <add name="Rotations 2" type="Quaternion" arr1="Num Vertices" cond="Has Rotations 2" ver2="4.2.2.0">The individual particle rotations.</add>
     </niobject>
 
-    <niobject name="NiAutoNormalParticlesData" inherit="NiParticlesData" until="V10_0_1_0">
+    <niobject name="NiAutoNormalParticlesData" inherit="NiParticlesData" module="NiLegacy" until="V10_0_1_0">
         Particle system data object (with automatic normals?).
     </niobject>
 
@@ -3767,7 +3781,7 @@
         <add name="Unknown Int 1" type="int" />
     </compound>
 
-    <niobject name="NiPSysData" inherit="NiParticlesData">
+    <niobject name="NiPSysData" inherit="NiParticlesData" module="NiParticle">
         Particle system data.
         <add name="Particle Descriptions" type="ParticleDesc" arr1="Num Vertices" vercond="!#BS202#" />
         <add name="Has Rotation Speeds" type="bool" ver1="20.0.0.2" />
@@ -3776,7 +3790,7 @@
         <add name="Added Particles Base" type="ushort" vercond="!#BS202#" />
     </niobject>
     
-    <niobject name="NiMeshPSysData" inherit="NiPSysData">
+    <niobject name="NiMeshPSysData" inherit="NiPSysData" module="NiParticle">
         Particle meshes data.
         <add name="Default Pool Size" type="uint" ver1="10.2.0.0" />
         <add name="Fill Pools On Load" type="bool" ver1="10.2.0.0" />
@@ -3785,17 +3799,17 @@
         <add name="Particle Meshes" type="Ref" template="NiNode" />
     </niobject>
 
-    <niobject name="NiBinaryExtraData" inherit="NiExtraData">
+    <niobject name="NiBinaryExtraData" inherit="NiExtraData" module="NiMain">
         Binary extra data object. Used to store tangents and bitangents in Oblivion.
         <add name="Binary Data" type="ByteArray">The binary data.</add>
     </niobject>
 
-    <niobject name="NiBinaryVoxelExtraData" inherit="NiExtraData" until="V3_1">
+    <niobject name="NiBinaryVoxelExtraData" inherit="NiExtraData" module="NiLegacy" until="V3_1">
         Voxel extra data object.
         <add name="Data" type="Ref" template="NiBinaryVoxelData" />
     </niobject>
 
-    <niobject name="NiBinaryVoxelData" inherit="NiObject" until="V3_1">
+    <niobject name="NiBinaryVoxelData" inherit="NiObject" module="NiLegacy" until="V3_1">
         Voxel data object.
         <add name="Unknown Short 1" type="ushort" />
         <add name="Unknown Short 2" type="ushort" />
@@ -3809,66 +3823,66 @@
         <add name="Unknown 5 Ints" type="uint" arr1="5" />
     </niobject>
 
-    <niobject name="NiBlendBoolInterpolator" inherit="NiBlendInterpolator">
+    <niobject name="NiBlendBoolInterpolator" inherit="NiBlendInterpolator" module="NiAnimation">
         Blends bool values together.
         <add name="Value" type="byte" default="2">The pose value. Invalid if using data.</add>
     </niobject>
 
-    <niobject name="NiBlendFloatInterpolator" inherit="NiBlendInterpolator">
+    <niobject name="NiBlendFloatInterpolator" inherit="NiBlendInterpolator" module="NiAnimation">
         Blends float values together.
         <add name="Value" type="float" default="#INV_FLT#">The pose value. Invalid if using data.</add>
     </niobject>
 
-    <niobject name="NiBlendPoint3Interpolator" inherit="NiBlendInterpolator">
+    <niobject name="NiBlendPoint3Interpolator" inherit="NiBlendInterpolator" module="NiAnimation">
         Blends NiPoint3 values together.
         <add name="Value" type="Vector3" default="#INV_VEC3#">The pose value. Invalid if using data.</add>
     </niobject>
 
-    <niobject name="NiBlendTransformInterpolator" inherit="NiBlendInterpolator">
+    <niobject name="NiBlendTransformInterpolator" inherit="NiBlendInterpolator" module="NiAnimation">
         Blends NiQuatTransform values together.
         <add name="Value" type="NiQuatTransform" ver2="10.1.0.109" />
     </niobject>
 
-    <niobject name="NiBoolData" inherit="NiObject">
+    <niobject name="NiBoolData" inherit="NiObject" module="NiAnimation">
         Wrapper for boolean animation keys.
         <add name="Data" type="KeyGroup" template="byte">The boolean keys.</add>
     </niobject>
 
-    <niobject name="NiBooleanExtraData" inherit="NiExtraData">
+    <niobject name="NiBooleanExtraData" inherit="NiExtraData" module="NiMain">
         Boolean extra data.
         <add name="Boolean Data" type="byte">The boolean extra data value.</add>
     </niobject>
 
-    <niobject name="NiBSplineBasisData" inherit="NiObject">
+    <niobject name="NiBSplineBasisData" inherit="NiObject" module="NiAnimation">
         Contains an NiBSplineBasis for use in interpolation of open, uniform B-Splines.
         <add name="Num Control Points" type="uint">The number of control points of the B-spline (number of frames of animation plus degree of B-spline minus one).</add>
     </niobject>
 
-    <niobject name="NiBSplineFloatInterpolator" abstract="true" inherit="NiBSplineInterpolator">
+    <niobject name="NiBSplineFloatInterpolator" abstract="true" inherit="NiBSplineInterpolator" module="NiAnimation">
         Uses B-Splines to animate a float value over time.
         <add name="Value" type="float" default="#INV_FLT#">Base value when curve not defined.</add>
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompFloatInterpolator" inherit="NiBSplineFloatInterpolator">
+    <niobject name="NiBSplineCompFloatInterpolator" inherit="NiBSplineFloatInterpolator" module="NiAnimation">
         NiBSplineFloatInterpolator plus the information required for using compact control points.
         <add name="Float Offset" type="float" default="#FLT_MAX#" />
         <add name="Float Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
-    <niobject name="NiBSplinePoint3Interpolator" abstract="true" inherit="NiBSplineInterpolator">
+    <niobject name="NiBSplinePoint3Interpolator" abstract="true" inherit="NiBSplineInterpolator" module="NiAnimation">
         Uses B-Splines to animate an NiPoint3 value over time.
         <add name="Value" type="Vector3" default="#INV_VEC3#">Base value when curve not defined.</add>
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompPoint3Interpolator" inherit="NiBSplinePoint3Interpolator">
+    <niobject name="NiBSplineCompPoint3Interpolator" inherit="NiBSplinePoint3Interpolator" module="NiAnimation">
         NiBSplinePoint3Interpolator plus the information required for using compact control points.
         <add name="Position Offset" type="float" default="#FLT_MAX#" />
         <add name="Position Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
-    <niobject name="NiBSplineTransformInterpolator" inherit="NiBSplineInterpolator">
+    <niobject name="NiBSplineTransformInterpolator" inherit="NiBSplineInterpolator" module="NiAnimation">
         Supports the animation of position, rotation, and scale using an NiQuatTransform.
         The NiQuatTransform can be an unchanging pose or interpolated from B-Spline control point channels.
         <add name="Transform" type="NiQuatTransform" />
@@ -3877,7 +3891,7 @@
         <add name="Scale Handle" type="uint" default="0xFFFF">Handle into the scale data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompTransformInterpolator" inherit="NiBSplineTransformInterpolator">
+    <niobject name="NiBSplineCompTransformInterpolator" inherit="NiBSplineTransformInterpolator" module="NiAnimation">
         NiBSplineTransformInterpolator plus the information required for using compact control points.
         <add name="Translation Offset" type="float" default="#FLT_MAX#" />
         <add name="Translation Half Range" type="float" default="#FLT_MAX#" />
@@ -3887,10 +3901,10 @@
         <add name="Scale Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 	
-	<niobject name="BSRotAccumTransfInterpolator" inherit="NiTransformInterpolator" versions="#BETHESDA#">
+	<niobject name="BSRotAccumTransfInterpolator" inherit="NiTransformInterpolator" module="BSAnimation" versions="#BETHESDA#">
 	</niobject>
 
-    <niobject name="NiBSplineData" inherit="NiObject">
+    <niobject name="NiBSplineData" inherit="NiObject" module="NiAnimation">
         Contains one or more sets of control points for use in interpolation of open, uniform B-Splines, stored as either float or compact.
         <add name="Num Float Control Points" type="uint" />
         <add name="Float Control Points" type="float" arr1="Num Float Control Points">Float values representing the control data.</add>
@@ -3898,7 +3912,7 @@
         <add name="Compact Control Points" type="short" arr1="Num Compact Control Points">Signed shorts representing the data from 0 to 1 (scaled by SHRT_MAX).</add>
     </niobject>
 
-    <niobject name="NiCamera" inherit="NiAVObject">
+    <niobject name="NiCamera" inherit="NiAVObject" module="NiMain">
         Camera object.
         <add name="Camera Flags" type="ushort" ver1="10.1.0.0">Obsolete flags.</add>
         <add name="Frustum Left" type="float" default="-0.63707">Frustrum left.</add>
@@ -3919,17 +3933,17 @@
         <add name="Unknown Int 3" type="uint" ver2="3.1" />
     </niobject>
 
-    <niobject name="NiColorData" inherit="NiObject">
+    <niobject name="NiColorData" inherit="NiObject" module="NiAnimation">
         Wrapper for color animation keys.
         <add name="Data" type="KeyGroup" template="Color4">The color keys.</add>
     </niobject>
 
-    <niobject name="NiColorExtraData" inherit="NiExtraData">
+    <niobject name="NiColorExtraData" inherit="NiExtraData" module="NiMain">
         Extra data in the form of NiColorA (red, green, blue, alpha).
         <add name="Data" type="Color4">RGBA Color?</add>
     </niobject>
 
-    <niobject name="NiControllerManager" inherit="NiTimeController">
+    <niobject name="NiControllerManager" inherit="NiTimeController" module="NiAnimation">
         Controls animation sequences on a specific branch of the scene graph.
         <add name="Cumulative" type="bool">Whether transformation accumulation is enabled. If accumulation is not enabled, the manager will treat all sequence data on the accumulation root as absolute data instead of relative delta values.</add>
         <add name="Num Controller Sequences" type="uint" />
@@ -3937,7 +3951,7 @@
         <add name="Object Palette" type="Ref" template="NiDefaultAVObjectPalette" />
     </niobject>
 
-    <niobject name="NiSequence" inherit="NiObject">
+    <niobject name="NiSequence" inherit="NiObject" module="NiAnimation">
         Root node in NetImmerse .kf files (until version 10.0).
         <add name="Name" type="string">The sequence name by which the animation system finds and manages this sequence.</add>
         <add name="Accum Root Name" type="string" ver2="10.1.0.103">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
@@ -3950,7 +3964,7 @@
         <add name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" />
     </niobject>
 
-    <niobject name="NiControllerSequence" inherit="NiSequence">
+    <niobject name="NiControllerSequence" inherit="NiSequence" module="NiAnimation">
         Root node in Gamebryo .kf files (version 10.0.1.0 and up).
         <add name="Weight" type="float" default="1.0" ver1="10.1.0.106">The weight of a sequence describes how it blends with other sequences at the same priority.</add>
         <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver1="10.1.0.106" />
@@ -3970,55 +3984,55 @@
         <add name="Anim Note Arrays" type="Ref" template="BSAnimNotes" arr1="Num Anim Note Arrays" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
     </niobject>
 
-    <niobject name="NiAVObjectPalette" abstract="true" inherit="NiObject">
+    <niobject name="NiAVObjectPalette" abstract="true" inherit="NiObject" module="NiMain">
         Abstract base class for indexing NiAVObject by name.
     </niobject>
 
-    <niobject name="NiDefaultAVObjectPalette" inherit="NiAVObjectPalette">
+    <niobject name="NiDefaultAVObjectPalette" inherit="NiAVObjectPalette" module="NiMain">
         NiAVObjectPalette implementation. Used to quickly look up objects by name.
         <add name="Scene" type="Ptr" template="NiAVObject">Scene root of the object palette.</add>
         <add name="Num Objs" type="uint">Number of objects.</add>
         <add name="Objs" type="AVObject" arr1="Num Objs">The objects.</add>
     </niobject>
 
-    <niobject name="NiDirectionalLight" inherit="NiLight">
+    <niobject name="NiDirectionalLight" inherit="NiLight" module="NiMain">
         Directional light source.
     </niobject>
 
-    <niobject name="NiDitherProperty" inherit="NiProperty">
+    <niobject name="NiDitherProperty" inherit="NiProperty" module="NiMain">
         NiDitherProperty allows the application to turn the dithering of interpolated colors and fog values on and off.
         <add name="Flags" type="DitherFlags" />
     </niobject>
 
-    <niobject name="NiRollController" inherit="NiSingleInterpController" until="V20_5_0_0">
+    <niobject name="NiRollController" inherit="NiSingleInterpController" module="NiAnimation" until="V20_5_0_0">
         DEPRECATED (10.2), REMOVED (20.5). Replaced by NiTransformController and NiLookAtInterpolator.
         <add name="Data" type="Ref" template="NiFloatData">The data for the controller.</add>
     </niobject>
 
-    <niobject name="NiFloatData" inherit="NiObject">
+    <niobject name="NiFloatData" inherit="NiObject" module="NiAnimation">
         Wrapper for 1D (one-dimensional) floating point animation keys.
         <add name="Data" type="KeyGroup" template="float">The keys.</add>
     </niobject>
 
-    <niobject name="NiFloatExtraData" inherit="NiExtraData">
+    <niobject name="NiFloatExtraData" inherit="NiExtraData" module="NiMain">
         Extra float data.
         <add name="Float Data" type="float">The float data.</add>
     </niobject>
 
-    <niobject name="NiFloatsExtraData" inherit="NiExtraData">
+    <niobject name="NiFloatsExtraData" inherit="NiExtraData" module="NiMain">
         Extra float array data.
         <add name="Num Floats" type="uint">Number of floats in the next field.</add>
         <add name="Data" type="float" arr1="Num Floats">Float data.</add>
     </niobject>
 
-    <niobject name="NiFogProperty" inherit="NiProperty">
+    <niobject name="NiFogProperty" inherit="NiProperty" module="NiMain">
         NiFogProperty allows the application to enable, disable and control the appearance of fog.
         <add name="Flags" type="FogFlags" />
         <add name="Fog Depth" type="float" default="1.0">Depth of the fog in normalized units. 1.0 = begins at near plane. 0.5 = begins halfway between the near and far planes.</add>
         <add name="Fog Color" type="Color3" default="#VEC3_ZERO#">The color of the fog.</add>
     </niobject>
 
-    <niobject name="NiGravity" inherit="NiParticleModifier" until="V10_0_1_0">
+    <niobject name="NiGravity" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier. Applies a gravitational field on the particles.
         <add name="Unknown Float 1" type="float" ver1="3.3.0.13" />
         <add name="Force" type="float">The strength/force of this gravity.</add>
@@ -4027,12 +4041,12 @@
         <add name="Direction" type="Vector3">The direction of the applied acceleration.</add>
     </niobject>
 
-    <niobject name="NiIntegerExtraData" inherit="NiExtraData">
+    <niobject name="NiIntegerExtraData" inherit="NiExtraData" module="NiMain">
         Extra integer data.
         <add name="Integer Data" type="uint">The value of the extra data.</add>
     </niobject>
 
-    <niobject name="BSXFlags" inherit="NiIntegerExtraData" versions="#BETHESDA#">
+    <niobject name="BSXFlags" inherit="NiIntegerExtraData" module="BSMain" versions="#BETHESDA#">
         Controls animation and collision.  Integer holds flags:
         Bit 0 : enable havok, bAnimated(Skyrim)
         Bit 1 : enable collision, bHavok(Skyrim)
@@ -4050,18 +4064,18 @@
         Bit 13: bSearchedBreakable(Skyrim) .. Runtime only?
     </niobject>
 
-    <niobject name="NiIntegersExtraData" inherit="NiExtraData">
+    <niobject name="NiIntegersExtraData" inherit="NiExtraData" module="NiMain">
         Extra integer array data.
         <add name="Num Integers" type="uint">Number of integers.</add>
         <add name="Data" type="uint" arr1="Num Integers">Integers.</add>
     </niobject>
 
-    <niobject name="BSKeyframeController" inherit="NiKeyframeController" versions="#BETHESDA#">
+    <niobject name="BSKeyframeController" inherit="NiKeyframeController" module="BSAnimation" versions="#BETHESDA#">
         An extended keyframe controller.
         <add name="Data 2" type="Ref" template="NiKeyframeData">A link to more keyframe data.</add>
     </niobject>
 
-    <niobject name="NiKeyframeData" inherit="NiObject">
+    <niobject name="NiKeyframeData" inherit="NiObject" module="NiAnimation">
         DEPRECATED (10.2), RENAMED (10.2) to NiTransformData.
         Wrapper for transformation animation keys.
         <add name="Num Rotation Keys" type="uint">The number of quaternion rotation keys. If the rotation type is XYZ (type 4) then this *must* be set to 1, and in this case the actual number of keys is stored in the XYZ Rotations field.</add>
@@ -4079,14 +4093,14 @@
         <option value="2" name="LOOK_Z_AXIS">Z-Axis</option>
     </bitflags>
 
-    <niobject name="NiLookAtController" inherit="NiTimeController" until="V20_5_0_0">
+    <niobject name="NiLookAtController" inherit="NiTimeController" module="NiAnimation" until="V20_5_0_0">
         DEPRECATED (10.2), REMOVED (20.5)
         Replaced by NiTransformController and NiLookAtInterpolator.
         <add name="Look At Flags" type="LookAtFlags" ver1="10.1.0.0" />
         <add name="Look At" type="Ptr" template="NiNode" />
     </niobject>
 
-    <niobject name="NiLookAtInterpolator" inherit="NiInterpolator">
+    <niobject name="NiLookAtInterpolator" inherit="NiInterpolator" module="NiAnimation">
         NiLookAtInterpolator rotates an object so that it always faces a target object.
         <add name="Flags" type="LookAtFlags" />
         <add name="Look At" type="Ptr" template="NiNode" />
@@ -4097,7 +4111,7 @@
         <add name="Interpolator: Scale" type="Ref" template="NiFloatInterpolator" />
     </niobject>
 
-    <niobject name="NiMaterialProperty" inherit="NiProperty">
+    <niobject name="NiMaterialProperty" inherit="NiProperty" module="NiMain">
         Describes the surface properties of an object e.g. translucency, ambient color, diffuse color, emissive color, and specular color.
         <add name="Flags" type="ushort" ver1="3.0" ver2="10.0.1.2">Property flags.</add>
         <add name="Ambient Color" type="Color3" default="#VEC3_ONE#" vercond="#BSVER# #LT# 26">How much the material reflects ambient light.</add>
@@ -4109,7 +4123,7 @@
         <add name="Emissive Mult" type="float" default="1.0" vercond="#BSVER# #GT# 21" />
     </niobject>
 
-    <niobject name="NiMorphData" inherit="NiObject">
+    <niobject name="NiMorphData" inherit="NiObject" module="NiAnimation">
         DEPRECATED (20.5), replaced by NiMorphMeshModifier.
         Geometry morphing data.
         <add name="Num Morphs" type="uint">Number of morphing object.</add>
@@ -4118,7 +4132,7 @@
         <add name="Morphs" type="Morph" arg="Num Vertices" arr1="Num Morphs">The geometry morphing objects.</add>
     </niobject>
 
-    <niobject name="NiNode" inherit="NiAVObject">
+    <niobject name="NiNode" inherit="NiAVObject" module="NiMain">
         Generic node object for grouping.
         <add name="Num Children" type="uint">The number of child objects.</add>
         <add name="Children" type="Ref" template="NiAVObject" arr1="Num Children">List of child node object indices.</add>
@@ -4126,29 +4140,29 @@
         <add name="Effects" type="Ref" template="NiDynamicEffect" arr1="Num Effects" vercond="#NI_BS_LT_FO4#">List of node effects. ADynamicEffect?</add>
     </niobject>
 
-    <niobject name="NiBone" inherit="NiNode">
+    <niobject name="NiBone" inherit="NiNode" module="NiLegacy">
         A NiNode used as a skeleton bone?
     </niobject>
 
-    <niobject name="NiCollisionSwitch" inherit="NiNode" until="V10_0_1_0">
+    <niobject name="NiCollisionSwitch" inherit="NiNode" module="NiLegacy" until="V10_0_1_0">
         Found in Munch's Oddysee
     </niobject>
 
-    <niobject name="AvoidNode" inherit="NiNode" versions="V4_0_0_2">
+    <niobject name="AvoidNode" inherit="NiNode" module="BSLegacy" versions="V4_0_0_2">
         Morrowind specific.
     </niobject>
 
-    <niobject name="FxWidget" inherit="NiNode" versions="V10_0_1_0">
+    <niobject name="FxWidget" inherit="NiNode" module="NiCustom" versions="V10_0_1_0">
         Firaxis-specific UI widgets?
         <add name="Unknown 3" type="byte" />
         <add name="Unknown 292 Bytes" type="byte" arr1="292" />
     </niobject>
 
-    <niobject name="FxButton" inherit="FxWidget" versions="V10_0_1_0">
+    <niobject name="FxButton" inherit="FxWidget" module="NiCustom" versions="V10_0_1_0">
         Unknown.
     </niobject>
 
-    <niobject name="FxRadioButton" inherit="FxWidget" versions="V10_0_1_0">
+    <niobject name="FxRadioButton" inherit="FxWidget" module="NiCustom" versions="V10_0_1_0">
         Unknown.
         <add name="Unknown Int 1" type="uint" />
         <add name="Unknown Int 2" type="uint" />
@@ -4157,7 +4171,7 @@
         <add name="Buttons" type="Ptr" template="FxRadioButton" arr1="Num Buttons">Unknown pointers to other buttons.  Maybe other buttons in a group so they can be switch off if this one is switched on?</add>
     </niobject>
 
-    <niobject name="NiBillboardNode" inherit="NiNode">
+    <niobject name="NiBillboardNode" inherit="NiNode" module="NiMain">
         These nodes will always be rotated to face the camera creating a billboard effect for any attached objects.
 
         In pre-10.1.0.0 the Flags field is used for BillboardMode.
@@ -4180,11 +4194,11 @@
         <add name="Billboard Mode" type="BillboardMode" ver1="10.1.0.0">The way the billboard will react to the camera.</add>
     </niobject>
 
-    <niobject name="NiBSAnimationNode" inherit="NiNode">
+    <niobject name="NiBSAnimationNode" inherit="NiNode" module="BSLegacy" until="V10_0_1_0">
         Bethesda-specific extension of Node with animation properties stored in the flags, often 42?
     </niobject>
 
-    <niobject name="NiBSParticleNode" inherit="NiNode">
+    <niobject name="NiBSParticleNode" inherit="NiNode" module="BSLegacy" until="V10_0_1_0">
         Unknown.
     </niobject>
     
@@ -4194,13 +4208,13 @@
         <option value="1" name="UpdateControllers">Update Controllers</option>
     </bitflags>
 
-    <niobject name="NiSwitchNode" inherit="NiNode">
+    <niobject name="NiSwitchNode" inherit="NiNode" module="NiMain">
         Represents groups of multiple scenegraph subtrees, only one of which (the "active child") is drawn at any given time.
         <add name="Switch Node Flags" type="NiSwitchFlags" default="3" ver1="10.1.0.0" />
         <add name="Index" type="uint" />
     </niobject>
 
-    <niobject name="NiLODNode" inherit="NiSwitchNode">
+    <niobject name="NiLODNode" inherit="NiSwitchNode" module="NiMain">
         Level of detail selector. Links to different levels of detail of the same model, used to switch a geometry at a specified distance.
         <add name="LOD Center" type="Vector3" ver1="4.0.0.2" ver2="10.0.1.0" />
         <add name="Num LOD Levels" type="uint" ver2="10.0.1.0" />
@@ -4208,7 +4222,7 @@
         <add name="LOD Level Data" type="Ref" template="NiLODData" ver1="10.1.0.0" />
     </niobject>
 
-    <niobject name="NiPalette" inherit="NiObject">
+    <niobject name="NiPalette" inherit="NiObject" module="NiMain">
         NiPalette objects represent mappings from 8-bit indices to 24-bit RGB or 32-bit RGBA colors.
         <add name="Has Alpha" type="byte">Not boolean but used as one, always 8-bit.</add>
         <add name="Num Entries" type="uint" default="256">The number of palette entries. Always 256 but can also be 16.</add>
@@ -4216,7 +4230,7 @@
         <add name="Palette" type="ByteColor4" arr1="256" cond="Num Entries != 16">The color palette.</add>
     </niobject>
 
-    <niobject name="NiParticleBomb" inherit="NiParticleModifier" until="V10_0_1_0">
+    <niobject name="NiParticleBomb" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Decay" type="float" />
         <add name="Duration" type="float" />
@@ -4228,66 +4242,68 @@
         <add name="Direction" type="Vector3">The direction of the applied acceleration?</add>
     </niobject>
 
-    <niobject name="NiParticleColorModifier" inherit="NiParticleModifier" until="V10_0_1_0">
+    <niobject name="NiParticleColorModifier" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Color Data" type="Ref" template="NiColorData" />
     </niobject>
 
-    <niobject name="NiParticleGrowFade" inherit="NiParticleModifier" until="V10_0_1_0">
+    <niobject name="NiParticleGrowFade" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Grow" type="float">The time from the beginning of the particle lifetime during which the particle grows.</add>
         <add name="Fade" type="float">The time from the end of the particle lifetime during which the particle fades.</add>
     </niobject>
 
-    <niobject name="NiParticleMeshModifier" inherit="NiParticleModifier" until="V10_0_1_0">
+    <niobject name="NiParticleMeshModifier" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Num Particle Meshes" type="uint" />
         <add name="Particle Meshes" arr1="Num Particle Meshes" type="Ref" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiParticleRotation" inherit="NiParticleModifier" until="V10_0_1_0">
+    <niobject name="NiParticleRotation" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Random Initial Axis" type="byte" />
         <add name="Initial Axis" type="Vector3" />
         <add name="Rotation Speed" type="float" />
     </niobject>
 
-    <niobject name="NiParticles" inherit="NiGeometry">
+    <niobject name="NiParticles" inherit="NiGeometry" module="NiMain">
         Generic particle system node.
-        Contains members to mimic inheritance shifts for Bethesda 20.2, which switched to using BSGeometry.
-        <add name="Vertex Desc" type="BSVertexDesc" vercond="#BS_GTE_SSE#" />
-        <add name="Far Begin" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Far End" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Near Begin" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Near End" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Data" type="Ref" template="NiPSysData" vercond="#BS_GTE_SSE#" />
     </niobject>
 
-    <niobject name="NiAutoNormalParticles" inherit="NiParticles" until="V10_0_1_0">
+    <niobject name="NiAutoNormalParticles" inherit="NiParticles" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1). NiParticles which do not house normals and generate them at runtime.
     </niobject>
 
-    <niobject name="NiParticleMeshes" inherit="NiParticles" until="V10_0_1_0">
+    <niobject name="NiParticleMeshes" inherit="NiParticles" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1). Particle meshes.
     </niobject>
 
-    <niobject name="NiParticleMeshesData" inherit="NiRotatingParticlesData" until="V10_0_1_0">
+    <niobject name="NiParticleMeshesData" inherit="NiRotatingParticlesData" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1). Particle meshes data.
         <add name="Unknown Link 2" type="Ref" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiParticleSystem" inherit="NiParticles">
+    <niobject name="NiParticleSystem" inherit="NiParticles" module="NiParticle">
         A particle system.
+        Contains members to mimic inheritance shifts for Bethesda 20.2, where NiParticles switched to inheriting BSGeometry.
+        Until inheritance shifts are supported, the members are on NiParticleSystem instead of NiParticles for module reasons.
+        <add name="Vertex Desc" type="BSVertexDesc" vercond="#BS_GTE_SSE#" />
+        <add name="Far Begin" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Far End" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Near Begin" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Near End" type="ushort" vercond="#BS_GTE_SKY#" />
+        <add name="Data" type="Ref" template="NiPSysData" vercond="#BS_GTE_SSE#" />
+
         <add name="World Space" type="bool" default="1" ver1="10.1.0.0">If true, Particles are birthed into world space.  If false, Particles are birthed into object space.</add>
         <add name="Num Modifiers" type="uint" ver1="10.1.0.0">The number of modifier references.</add>
         <add name="Modifiers" type="Ref" template="NiPSysModifier" arr1="Num Modifiers" ver1="10.1.0.0">The list of particle modifiers.</add>
     </niobject>
 
-    <niobject name="NiMeshParticleSystem" inherit="NiParticleSystem">
+    <niobject name="NiMeshParticleSystem" inherit="NiParticleSystem" module="NiParticle">
         Particle system.
     </niobject>
 
-    <niobject name="NiParticleSystemController" inherit="NiTimeController" until="V10_0_1_0">
+    <niobject name="NiParticleSystemController" inherit="NiTimeController" module="NiLegacy" until="V10_0_1_0">
         A generic particle system time controller object.
         <add name="Old Speed" type="uint" ver2="3.1">Particle speed in old files</add>
         <add name="Speed" type="float" ver1="3.3.0.13">Particle speed</add>
@@ -4339,11 +4355,11 @@
         <add name="Unknown Floats 2" arr1="Particle Unknown Short" type="float" ver2="3.1" />
     </niobject>
 
-    <niobject name="NiBSPArrayController" inherit="NiParticleSystemController" until="V10_0_1_0">
+    <niobject name="NiBSPArrayController" inherit="NiParticleSystemController" module="BSLegacy" until="V10_0_1_0">
         A particle system controller, used by BS in conjunction with NiBSParticleNode.
     </niobject>
 
-    <niobject name="NiPathController" inherit="NiTimeController" until="V20_5_0_0">
+    <niobject name="NiPathController" inherit="NiTimeController" module="NiAnimation" until="V20_5_0_0">
         DEPRECATED (10.2), REMOVED (20.5). Replaced by NiTransformController and NiPathInterpolator.
         Time controller for a path.
         <add name="Path Flags" type="PathFlags" ver1="10.1.0.0" />
@@ -4362,7 +4378,7 @@
         <add name="Is Signed" type="bool" />
     </compound>
 
-    <niobject name="NiPixelFormat" abstract="true" inherit="NiObject">
+    <niobject name="NiPixelFormat" abstract="true" inherit="NiObject" module="NiMain">
         NiPixelFormat is not the parent to NiPixelData/NiPersistentSrcTextureRendererData,
         but actually a member class loaded at the top of each. The two classes are not related.
         However, faking this inheritance is useful for several things.
@@ -4389,7 +4405,7 @@
         <add name="Channels" type="PixelFormatComponent" arr1="4" ver1="10.4.0.2">Channel Data</add>
     </niobject>
 
-    <niobject name="NiPersistentSrcTextureRendererData" inherit="NiPixelFormat">
+    <niobject name="NiPersistentSrcTextureRendererData" inherit="NiPixelFormat" module="NiMain">
         <add name="Palette" type="Ref" template="NiPalette" />
         <add name="Num Mipmaps" type="uint" />
         <add name="Bytes Per Pixel" type="uint" />
@@ -4402,7 +4418,7 @@
         <add name="Pixel Data" type="byte" binary="true" arr1="Num Pixels * Num Faces" />
     </niobject>
 
-    <niobject name="NiPixelData" inherit="NiPixelFormat">
+    <niobject name="NiPixelData" inherit="NiPixelFormat" module="NiMain">
         A texture.
         <add name="Palette" type="Ref" template="NiPalette" />
         <add name="Num Mipmaps" type="uint" />
@@ -4415,7 +4431,7 @@
         <add name="Pixel Data" type="byte" binary="true" arr1="Num Pixels * Num Faces" ver1="10.4.0.2" />
     </niobject>
 
-    <niobject name="NiPlanarCollider" inherit="NiParticleModifier" until="V10_0_1_0">
+    <niobject name="NiPlanarCollider" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Unknown Short" type="ushort" ver1="10.0.1.0" />
         <add name="Unknown Float 1" type="float" />
@@ -4437,19 +4453,19 @@
         <add name="Unknown Float 16" type="float" />
     </niobject>
 
-    <niobject name="NiPointLight" inherit="NiLight">
+    <niobject name="NiPointLight" inherit="NiLight" module="NiMain">
         A point light.
         <add name="Constant Attenuation" type="float" />
         <add name="Linear Attenuation" type="float" default="1.0" />
         <add name="Quadratic Attenuation" type="float" />
     </niobject>
 
-    <niobject name="NiPosData" inherit="NiObject">
+    <niobject name="NiPosData" inherit="NiObject" module="NiAnimation">
         Wrapper for position animation keys.
         <add name="Data" type="KeyGroup" template="Vector3" />
     </niobject>
 
-    <niobject name="NiRotData" inherit="NiObject">
+    <niobject name="NiRotData" inherit="NiObject" module="NiAnimation">
         Wrapper for rotation animation keys.
         <add name="Num Rotation Keys" type="uint" />
         <add name="Rotation Type" type="KeyType" cond="Num Rotation Keys != 0" />
@@ -4457,13 +4473,13 @@
         <add name="XYZ Rotations" type="KeyGroup" template="float" arr1="3" cond="Rotation Type == 4" />
     </niobject>
 
-    <niobject name="NiPSysAgeDeathModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysAgeDeathModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that controls and updates the age of particles in the system.
         <add name="Spawn on Death" type="bool">Should the particles spawn on death?</add>
         <add name="Spawn Modifier" type="Ref" template="NiPSysSpawnModifier">The spawner to use on death.</add>
     </niobject>
 
-    <niobject name="NiPSysBombModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysBombModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that applies an explosive force to particles.
         <add name="Bomb Object" type="Ptr" template="NiNode">The object whose position and orientation are the basis of the force.</add>
         <add name="Bomb Axis" type="Vector3">The local direction of the force.</add>
@@ -4473,35 +4489,35 @@
         <add name="Symmetry Type" type="SymmetryType" />
     </niobject>
 
-    <niobject name="NiPSysBoundUpdateModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysBoundUpdateModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that creates and updates bound volumes.
         <add name="Update Skip" type="ushort">Optimize by only computing the bound of (1 / Update Skip) of the total particles each frame.</add>
     </niobject>
 
-    <niobject name="NiPSysBoxEmitter" inherit="NiPSysVolumeEmitter">
+    <niobject name="NiPSysBoxEmitter" inherit="NiPSysVolumeEmitter" module="NiParticle">
         Particle emitter that uses points within a defined Box shape to emit from.
         <add name="Width" type="float" />
         <add name="Height" type="float" />
         <add name="Depth" type="float" />
     </niobject>
 
-    <niobject name="NiPSysColliderManager" inherit="NiPSysModifier">
+    <niobject name="NiPSysColliderManager" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that adds a defined shape to act as a collision object for particles to interact with.
         <add name="Collider" type="Ref" template="NiPSysCollider" />
     </niobject>
 
-    <niobject name="NiPSysColorModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysColorModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that adds keyframe data to modify color/alpha values of particles over time.
         <add name="Data" type="Ref" template="NiColorData" />
     </niobject>
 
-    <niobject name="NiPSysCylinderEmitter" inherit="NiPSysVolumeEmitter">
+    <niobject name="NiPSysCylinderEmitter" inherit="NiPSysVolumeEmitter" module="NiParticle">
         Particle emitter that uses points within a defined Cylinder shape to emit from.
         <add name="Radius" type="float" />
         <add name="Height" type="float" />
     </niobject>
 
-    <niobject name="NiPSysDragModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysDragModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that applies a linear drag force to particles.
         <add name="Drag Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the force.</add>
         <add name="Drag Axis" type="Vector3" default="#X_AXIS#">The local direction of the force.</add>
@@ -4510,14 +4526,14 @@
         <add name="Range Falloff" type="float" default="#FLT_MAX#">The distance at which particles cease to be affected.</add>
     </niobject>
 
-    <niobject name="NiPSysEmitterCtlrData" inherit="NiObject">
+    <niobject name="NiPSysEmitterCtlrData" inherit="NiObject" module="NiParticle">
         DEPRECATED (10.2). Particle system emitter controller data.
         <add name="Birth Rate Keys" type="KeyGroup" template="float" />
         <add name="Num Active Keys" type="uint" />
         <add name="Active Keys" type="Key" arg="1" template="byte" arr1="Num Active Keys" />
     </niobject>
 
-    <niobject name="NiPSysGravityModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysGravityModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that applies a gravitational force to particles.
         <add name="Gravity Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the force.</add>
         <add name="Gravity Axis" type="Vector3" default="#X_AXIS#">The local direction of the force.</add>
@@ -4529,7 +4545,7 @@
         <add name="World Aligned" type="bool" vercond="!#NI_BS_LTE_16#" />
     </niobject>
 
-    <niobject name="NiPSysGrowFadeModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysGrowFadeModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that controls the time it takes to grow and shrink a particle.
         <add name="Grow Time" type="float">The time taken to grow from 0 to their specified size.</add>
         <add name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</add>
@@ -4538,7 +4554,7 @@
         <add name="Base Scale" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_FO3#">A multiplier on the base particle scale.</add>
     </niobject>
 
-    <niobject name="NiPSysMeshEmitter" inherit="NiPSysEmitter">
+    <niobject name="NiPSysMeshEmitter" inherit="NiPSysEmitter" module="NiParticle">
         Particle emitter that uses points on a specified mesh to emit from.
         <add name="Num Emitter Meshes" type="uint" />
         <add name="Emitter Meshes" type="Ptr" template="NiAVObject" arr1="Num Emitter Meshes">The meshes which are emitted from.</add>
@@ -4547,30 +4563,30 @@
         <add name="Emission Axis" type="Vector3" default="#X_AXIS#">The emission axis if VELOCITY_USE_DIRECTION.</add>
     </niobject>
 
-    <niobject name="NiPSysMeshUpdateModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysMeshUpdateModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that updates mesh particles using the age of each particle.
         <add name="Num Meshes" type="uint" />
         <add name="Meshes" type="Ref" template="NiAVObject" arr1="Num Meshes" />
     </niobject>
     
-    <niobject name="BSPSysInheritVelocityModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
+    <niobject name="BSPSysInheritVelocityModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
         <add name="Inherit Object" type="Ptr" template="NiAVObject" />
         <add name="Chance To Inherit" type="float" default="100.0" />
         <add name="Velocity Multiplier" type="float" default="0.5" />
         <add name="Velocity Variation" type="float" />
     </niobject>
     
-    <niobject name="BSPSysHavokUpdateModifier" inherit="NiPSysMeshUpdateModifier" versions="#BETHESDA#">
+    <niobject name="BSPSysHavokUpdateModifier" inherit="NiPSysMeshUpdateModifier" module="BSParticle" versions="#BETHESDA#">
         <add name="Modifier" type="Ref" template="NiPSysModifier" />
     </niobject>
 
-    <niobject name="BSPSysRecycleBoundModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
+    <niobject name="BSPSysRecycleBoundModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
         <add name="Bound Offset" type="Vector3" />
         <add name="Bound Extent" type="Vector3" />
         <add name="Bound Object" type="Ptr" template="NiAVObject" />
     </niobject> 
     
-    <niobject name="BSPSysSubTexModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
+    <niobject name="BSPSysSubTexModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
         Similar to a Flip Controller, this handles particle texture animation on a single texture atlas
         <add name="Start Frame" type="float">Starting frame/position on atlas</add>
         <add name="Start Frame Fudge" type="float" default="64.0">Random chance to start on a different frame?</add>
@@ -4581,7 +4597,7 @@
         <add name="Frame Count Fudge" type="float" />
     </niobject>
     
-    <niobject name="NiPSysPlanarCollider" inherit="NiPSysCollider">
+    <niobject name="NiPSysPlanarCollider" inherit="NiPSysCollider" module="NiParticle">
         Particle Collider object which particles will interact with.
         <add name="Width" type="float">Width of the plane along the X Axis.</add>
         <add name="Height" type="float">Height of the plane along the Y Axis.</add>
@@ -4589,20 +4605,20 @@
         <add name="Y Axis" type="Vector3">Axis defining a plane, relative to Collider Object.</add>
     </niobject>
 
-    <niobject name="NiPSysSphericalCollider" inherit="NiPSysCollider">
+    <niobject name="NiPSysSphericalCollider" inherit="NiPSysCollider" module="NiParticle">
         Particle Collider object which particles will interact with.
         <add name="Radius" type="float" />
     </niobject>
 
-    <niobject name="NiPSysPositionModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysPositionModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that updates the particle positions based on velocity and last update time.
     </niobject>
 
-    <niobject name="NiPSysResetOnLoopCtlr" inherit="NiTimeController">
+    <niobject name="NiPSysResetOnLoopCtlr" inherit="NiTimeController" module="NiParticle">
         Particle modifier that calls reset on a target upon looping.
     </niobject>
 
-    <niobject name="NiPSysRotationModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysRotationModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that adds rotations to particles.
         <add name="Rotation Speed" type="float">Initial Rotation Speed in radians per second.</add>
         <add name="Rotation Speed Variation" type="float" ver1="20.0.0.2">Distributes rotation speed over the range [Speed - Variation, Speed + Variation].</add>
@@ -4613,7 +4629,7 @@
         <add name="Axis" type="Vector3" default="#X_AXIS#">Initial rotation axis.</add>
     </niobject>
 
-    <niobject name="NiPSysSpawnModifier" inherit="NiPSysModifier">
+    <niobject name="NiPSysSpawnModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that spawns additional copies of a particle.
         <add name="Num Spawn Generations" type="ushort" default="0">Number of allowed generations for spawning. Particles whose generations are >= will not be spawned.</add>
         <add name="Percentage Spawned" type="float" default="1.0">The likelihood of a particular particle being spawned. Must be between 0.0 and 1.0.</add>
@@ -4626,23 +4642,23 @@
         <add name="Life Span Variation" type="float">The amount the lifespan can vary.</add>
     </niobject>
 
-    <niobject name="NiPSysPartSpawnModifier" inherit="NiPSysModifier" versions="V10_2_0_1 V10_3_0_1 V10_4_0_1">
+    <niobject name="NiPSysPartSpawnModifier" inherit="NiPSysModifier" module="NiCustom" versions="V10_2_0_1 V10_3_0_1 V10_4_0_1">
         WorldShift-specific Particle Spawn modifier
         <add name="Unknown Float 1" type="float" />
         <add name="Unknown Float 2" type="float" />
         <add name="Spawner" type="Ref" template="NiPSysSpawnModifier" />
     </niobject>
 
-    <niobject name="NiPSysSphereEmitter" inherit="NiPSysVolumeEmitter">
+    <niobject name="NiPSysSphereEmitter" inherit="NiPSysVolumeEmitter" module="NiParticle">
         Particle emitter that uses points within a sphere shape to emit from.
         <add name="Radius" type="float" />
     </niobject>
 
-    <niobject name="NiPSysUpdateCtlr" inherit="NiTimeController">
+    <niobject name="NiPSysUpdateCtlr" inherit="NiTimeController" module="NiParticle">
         Particle system controller, tells the system to update its simulation.
     </niobject>
 
-    <niobject name="NiPSysFieldModifier" abstract="true" inherit="NiPSysModifier">
+    <niobject name="NiPSysFieldModifier" abstract="true" inherit="NiPSysModifier" module="NiParticle">
         Base for all force field particle modifiers.
         <add name="Field Object" type="Ref" template="NiAVObject">The object whose position and orientation are the basis of the field.</add>
         <add name="Magnitude" type="float">Magnitude of the force.</add>
@@ -4651,89 +4667,89 @@
         <add name="Max Distance" type="float">Maximum distance after which there is no effect.</add>
     </niobject>
 
-    <niobject name="NiPSysVortexFieldModifier" inherit="NiPSysFieldModifier">
+    <niobject name="NiPSysVortexFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, implements a vortex field force for particles.
         <add name="Direction" type="Vector3">Direction of the vortex field in Field Object's space.</add>
     </niobject>
 
-    <niobject name="NiPSysGravityFieldModifier" inherit="NiPSysFieldModifier">
+    <niobject name="NiPSysGravityFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, implements a gravity field force for particles.
         <add name="Direction" type="Vector3" default="#NEG_Y_AXIS#">Direction of the gravity field in Field Object's space.</add>
     </niobject>
 
-    <niobject name="NiPSysDragFieldModifier" inherit="NiPSysFieldModifier">
+    <niobject name="NiPSysDragFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, implements a drag field force for particles.
         <add name="Use Direction" type="bool">Whether or not the drag force applies only in the direction specified.</add>
         <add name="Direction" type="Vector3">Direction in which the force applies if Use Direction is true.</add>
     </niobject>
 
-    <niobject name="NiPSysTurbulenceFieldModifier" inherit="NiPSysFieldModifier">
+    <niobject name="NiPSysTurbulenceFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, implements a turbulence field force for particles.
         <add name="Frequency" type="float">How many turbulence updates per second.</add>
     </niobject>
 
-    <niobject name="BSPSysLODModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
+    <niobject name="BSPSysLODModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
         <add name="LOD Begin Distance" type="float" default="0.1" />
         <add name="LOD End Distance" type="float" default="0.7" />
         <add name="End Emit Scale" type="float" default="0.2" />
         <add name="End Size" type="float" default="1.0" />
     </niobject>
     
-    <niobject name="BSPSysScaleModifier" inherit="NiPSysModifier" versions="#BETHESDA#">
+    <niobject name="BSPSysScaleModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
         <add name="Num Scales" type="uint" />
         <add name="Scales" type="float" arr1="Num Scales" />
     </niobject>
     
     
-    <niobject name="NiPSysFieldMagnitudeCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysFieldMagnitudeCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for force field magnitude.
     </niobject>
 
-    <niobject name="NiPSysFieldAttenuationCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysFieldAttenuationCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for force field attenuation.
     </niobject>
 
-    <niobject name="NiPSysFieldMaxDistanceCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysFieldMaxDistanceCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for force field maximum distance.
     </niobject>
 
-    <niobject name="NiPSysAirFieldAirFrictionCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysAirFieldAirFrictionCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for air field air friction.
     </niobject>
 
-    <niobject name="NiPSysAirFieldInheritVelocityCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysAirFieldInheritVelocityCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for air field inherit velocity.
     </niobject>
 
-    <niobject name="NiPSysAirFieldSpreadCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysAirFieldSpreadCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for air field spread.
     </niobject>
 
-    <niobject name="NiPSysInitialRotSpeedCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysInitialRotSpeedCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for emitter initial rotation speed.
     </niobject>
 
-    <niobject name="NiPSysInitialRotSpeedVarCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysInitialRotSpeedVarCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for emitter initial rotation speed variation.
     </niobject>
 
-    <niobject name="NiPSysInitialRotAngleCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysInitialRotAngleCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for emitter initial rotation angle.
     </niobject>
 
-    <niobject name="NiPSysInitialRotAngleVarCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysInitialRotAngleVarCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for emitter initial rotation angle variation.
     </niobject>
 
-    <niobject name="NiPSysEmitterPlanarAngleCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterPlanarAngleCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for emitter planar angle.
     </niobject>
 
-    <niobject name="NiPSysEmitterPlanarAngleVarCtlr" inherit="NiPSysModifierFloatCtlr">
+    <niobject name="NiPSysEmitterPlanarAngleVarCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
         Particle system controller for emitter planar angle variation.
     </niobject>
 
-    <niobject name="NiPSysAirFieldModifier" inherit="NiPSysFieldModifier">
+    <niobject name="NiPSysAirFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, updates the particle velocity to simulate the effects of air movements like wind, fans, or wake.
         <add name="Direction" type="Vector3" default="#NEG_X_AXIS#">Direction of the particle velocity</add>
         <add name="Air Friction" type="float">How quickly particles will accelerate to the magnitude of the air field.</add>
@@ -4744,7 +4760,7 @@
         <add name="Spread" type="float">The angle of the air field cone if Enable Spread is true.</add>
     </niobject>
     
-    <niobject name="NiPSysTrailEmitter" inherit="NiPSysEmitter">
+    <niobject name="NiPSysTrailEmitter" inherit="NiPSysEmitter" module="NiCustom">
         Guild 2-Specific node
         <add name="Unknown Int 1" type="int" />
         <add name="Unknown Float 1" type="float" />
@@ -4759,27 +4775,27 @@
         <add name="Unknown Float 7" type="float" />
     </niobject>
 
-    <niobject name="NiLightIntensityController" inherit="NiFloatInterpController">
+    <niobject name="NiLightIntensityController" inherit="NiFloatInterpController" module="NiAnimation">
         Unknown controller
     </niobject>
 
-    <niobject name="NiPSysRadialFieldModifier" inherit="NiPSysFieldModifier">
+    <niobject name="NiPSysRadialFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, updates the particle velocity to simulate the effects of point gravity.
         <add name="Radial Type" type="float">If zero, no attenuation.</add>
     </niobject>
 
-    <niobject name="NiLODData" abstract="true" inherit="NiObject">
+    <niobject name="NiLODData" abstract="true" inherit="NiObject" module="NiMain">
         Abstract class used for different types of LOD selections.
     </niobject>
 
-    <niobject name="NiRangeLODData" inherit="NiLODData">
+    <niobject name="NiRangeLODData" inherit="NiLODData" module="NiMain">
         NiRangeLODData controls switching LOD levels based on Z depth from the camera to the NiLODNode.
         <add name="LOD Center" type="Vector3" />
         <add name="Num LOD Levels" type="uint" />
         <add name="LOD Levels" type="LODRange" arr1="Num LOD Levels" />
     </niobject>
 
-    <niobject name="NiScreenLODData" inherit="NiLODData">
+    <niobject name="NiScreenLODData" inherit="NiLODData" module="NiMain">
         NiScreenLODData controls switching LOD levels based on proportion of the screen that a bound would include.
         <add name="Bounding Sphere" type="NiBound" />
         <add name="World Bounding Sphere" type="NiBound" />
@@ -4787,21 +4803,21 @@
         <add name="Proportion Levels" type="float" arr1="Num Proportions" />
     </niobject>
 
-    <niobject name="NiRotatingParticles" inherit="NiParticles" until="V10_0_1_0">
+    <niobject name="NiRotatingParticles" inherit="NiParticles" module="NiLegacy" until="V10_0_1_0">
         Unknown.
     </niobject>
 
-    <niobject name="NiSequenceStreamHelper" inherit="NiObjectNET" until="V20_2_0_8">
+    <niobject name="NiSequenceStreamHelper" inherit="NiObjectNET" module="NiAnimation" until="V20_2_0_8">
         DEPRECATED (pre-10.1), REMOVED (20.3).
         Keyframe animation root node, in .kf files.
     </niobject>
 
-    <niobject name="NiShadeProperty" inherit="NiProperty">
+    <niobject name="NiShadeProperty" inherit="NiProperty" module="NiMain">
         Determines whether flat shading or smooth shading is used on a shape.
         <add name="Flags" type="ShadeFlags" default="SHADING_SMOOTH" vercond="#NI_BS_LTE_FO3#" />
     </niobject>
 
-    <niobject name="NiSkinData" inherit="NiObject">
+    <niobject name="NiSkinData" inherit="NiObject" module="NiMain">
         Skinning data.
         <add name="Skin Transform" type="NiTransform">Offset of the skin from this bone in bind position.</add>
         <add name="Num Bones" type="uint">Number of bones.</add>
@@ -4810,7 +4826,7 @@
         <add name="Bone List" type="BoneData" arr1="Num Bones" arg="Has Vertex Weights">Contains offset data for each node that this skin is influenced by.</add>
     </niobject>
 
-    <niobject name="NiSkinInstance" inherit="NiObject">
+    <niobject name="NiSkinInstance" inherit="NiObject" module="NiMain">
         Skinning instance.
         <add name="Data" type="Ref" template="NiSkinData">Skinning data reference.</add>
         <add name="Skin Partition" type="Ref" template="NiSkinPartition" ver1="10.1.0.101">Refers to a NiSkinPartition objects, which partitions the mesh such that every vertex is only influenced by a limited number of bones.</add>
@@ -4819,7 +4835,7 @@
         <add name="Bones" type="Ptr" template="NiNode" arr1="Num Bones">List of all armature bones.</add>
     </niobject>
 
-    <niobject name="NiTriShapeSkinController" inherit="NiTimeController">
+    <niobject name="NiTriShapeSkinController" inherit="NiTimeController" module="NiLegacy" until="V10_0_1_0">
         Old version of skinning instance.
         <add name="Num Bones" type="uint">The number of node bones referenced as influences.</add>
         <add name="Vertex Counts" type="uint" arr1="Num Bones">The number of vertex weights stored for each bone.</add>
@@ -4827,7 +4843,7 @@
         <add name="Bone Data" type="OldSkinData" arr1="Num Bones" arr2="Vertex Counts">Contains skin weight data for each node that this skin is influenced by.</add>
     </niobject>
 
-    <niobject name="NiSkinPartition" inherit="NiObject">
+    <niobject name="NiSkinPartition" inherit="NiObject" module="NiMain">
         Skinning data, optimized for hardware skinning. The mesh is partitioned in submeshes such that each vertex of a submesh is influenced only by a limited and fixed number of bones.
         <add name="Num Partitions" type="uint" />
 		<add name="Data Size" type="uint" calc="#LEN[Vertex Data]# #MUL# Vertex Size" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
@@ -4837,7 +4853,7 @@
 		<add name="Partitions" type="SkinPartition" arr1="Num Partitions" />
     </niobject>
 
-    <niobject name="NiTexture" abstract="true" inherit="NiObjectNET">
+    <niobject name="NiTexture" abstract="true" inherit="NiObjectNET" module="NiMain">
         A texture.
     </niobject>
 
@@ -4848,7 +4864,7 @@
         <add name="Alpha Format" type="AlphaFormat" default="ALPHA_DEFAULT">Requests no alpha, 1-bit alpha, or </add>
     </compound>
 
-    <niobject name="NiSourceTexture" inherit="NiTexture">
+    <niobject name="NiSourceTexture" inherit="NiTexture" module="NiMain">
         Describes texture source and properties.
         <add name="Use External" type="byte" default="1">Is the texture external?</add>
         <add name="File Name" type="FilePath" cond="Use External == 1">The external texture file name.</add>
@@ -4862,12 +4878,12 @@
         <add name="Persist Render Data" type="bool" default="0" ver1="20.2.0.4">Pixel Data is NiPersistentSrcTextureRendererData instead of NiPixelData.</add>
     </niobject>
 
-    <niobject name="NiSpecularProperty" inherit="NiProperty">
+    <niobject name="NiSpecularProperty" inherit="NiProperty" module="NiMain">
         Gives specularity to a shape. Flags 0x0001.
         <add name="Flags" type="SpecularFlags" />
     </niobject>
 
-    <niobject name="NiSphericalCollider" inherit="NiParticleModifier" until="V10_0_1_0">
+    <niobject name="NiSphericalCollider" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
         <add name="Unknown Float 1" type="float" />
         <add name="Unknown Short 1" type="ushort" />
@@ -4878,14 +4894,14 @@
         <add name="Unknown Float 5" type="float" />
     </niobject>
 
-    <niobject name="NiSpotLight" inherit="NiPointLight">
+    <niobject name="NiSpotLight" inherit="NiPointLight" module="NiMain">
         A spot.
         <add name="Outer Spot Angle" type="float" />
         <add name="Inner Spot Angle" type="float" ver1="20.2.0.5" />
         <add name="Exponent" type="float" default="1.0">Describes the distribution of light. (see: glLight)</add>
     </niobject>
 
-    <niobject name="NiStencilProperty" inherit="NiProperty">
+    <niobject name="NiStencilProperty" inherit="NiProperty" module="NiMain">
         Allows control of stencil testing.
         <add name="Flags" type="ushort" ver2="10.0.1.2">Property flags.</add>
         <add name="Stencil Enabled" type="byte" ver2="20.0.0.5">Enables or disables the stencil test.</add>
@@ -4901,30 +4917,30 @@
         <add name="Stencil Mask" type="uint" default="#UINT_MAX#" ver1="20.1.0.3">A bit mask. The default is 0xffffffff.</add>
     </niobject>
 
-    <niobject name="NiStringExtraData" inherit="NiExtraData">
+    <niobject name="NiStringExtraData" inherit="NiExtraData" module="NiMain">
         Apparently commands for an optimizer instructing it to keep things it would normally discard.
         Also refers to NiNode objects (through their name) in animation .kf files.
         <add name="String Data" type="string" ver1="4.0.0.0">The string.</add>
     </niobject>
 
-    <niobject name="NiStringPalette" inherit="NiObject">
+    <niobject name="NiStringPalette" inherit="NiObject" module="NiMain">
         List of 0x00-seperated strings, which are names of controlled objects and controller types. Used in .kf files in conjunction with NiControllerSequence.
         <add name="Palette" type="StringPalette">A bunch of 0x00 seperated strings.</add>
     </niobject>
 
-    <niobject name="NiStringsExtraData" inherit="NiExtraData">
+    <niobject name="NiStringsExtraData" inherit="NiExtraData" module="NiMain">
         List of strings; for example, a list of all bone names.
         <add name="Num Strings" type="uint" default="1">Number of strings.</add>
         <add name="Data" type="SizedString" arr1="Num Strings">The strings.</add>
     </niobject>
 
-    <niobject name="NiTextKeyExtraData" inherit="NiExtraData">
+    <niobject name="NiTextKeyExtraData" inherit="NiExtraData" module="NiMain">
         Extra data, used to name different animation sequences.
         <add name="Num Text Keys" type="uint">The number of text keys that follow.</add>
         <add name="Text Keys" type="Key" arg="1" template="string" arr1="Num Text Keys">List of textual notes and at which time they take effect. Used for designating the start and stop of animations and the triggering of sounds.</add>
     </niobject>
 
-    <niobject name="NiTextureEffect" inherit="NiDynamicEffect">
+    <niobject name="NiTextureEffect" inherit="NiDynamicEffect" module="NiMain">
         Represents an effect that uses projected textures such as projected lights (gobos), environment maps, and fog maps.
         <add name="Model Projection Matrix" type="Matrix33">Model projection matrix.  Always identity?</add>
         <add name="Model Projection Transform" type="Vector3">Model projection transform.  Always (0,0,0)?</add>
@@ -4942,7 +4958,7 @@
         <add name="Unknown Short" type="ushort" ver2="4.1.0.12" default="0" />
     </niobject>
 
-    <niobject name="NiTextureModeProperty" inherit="NiProperty" until="V10_0_1_0">
+    <niobject name="NiTextureModeProperty" inherit="NiProperty" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1)
         <add name="Unknown Ints" type="uint" arr1="3" ver2="2.3" />
         <add name="Flags" type="ushort" ver1="3.0">Either 210 or 194.</add>
@@ -4950,7 +4966,7 @@
         <add name="PS2 K" type="short" default="-75" ver1="3.1" ver2="10.2.0.0" />
     </niobject>
 
-    <niobject name="NiImage" inherit="NiObject" until="V10_0_1_0">
+    <niobject name="NiImage" inherit="NiObject" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1)
         <add name="Use External" type="byte">0 if the texture is internal to the NIF file.</add>
         <add name="File Name" type="FilePath" cond="Use External != 0">The filepath to the texture.</add>
@@ -4959,7 +4975,7 @@
         <add name="Unknown Float" type="float" ver1="3.1" default="128.5" />
     </niobject>
 
-    <niobject name="NiTextureProperty" inherit="NiProperty" until="V10_0_1_0">
+    <niobject name="NiTextureProperty" inherit="NiProperty" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1)
         <add name="Unknown Ints 1" type="uint" arr1="2" ver2="2.3" />
         <add name="Flags" type="ushort" ver1="3.0">Property flags.</add>
@@ -4967,7 +4983,7 @@
         <add name="Unknown Ints 2" type="uint" arr1="2" ver1="3.0" ver2="3.03" />
     </niobject>
 
-    <niobject name="NiTexturingProperty" inherit="NiProperty">
+    <niobject name="NiTexturingProperty" inherit="NiProperty" module="NiMain">
         Describes how a fragment shader should be configured for a given piece of geometry.
         <add name="Flags" type="ushort" ver2="10.0.1.2">Property flags.</add>
         <add name="Flags" type="TexturingFlags" ver1="20.1.0.2">Property flags.</add>
@@ -5010,17 +5026,17 @@
         <add name="Shader Textures" type="ShaderTexDesc" arr1="Num Shader Textures" ver1="10.0.1.0" />
     </niobject>
 
-    <niobject name="NiMultiTextureProperty" inherit="NiTexturingProperty" />
+    <niobject name="NiMultiTextureProperty" inherit="NiTexturingProperty" module="NiLegacy" />
 
-    <niobject name="NiTransformData" inherit="NiKeyframeData">
+    <niobject name="NiTransformData" inherit="NiKeyframeData" module="NiAnimation">
         Wrapper for transformation animation keys.
     </niobject>
 
-    <niobject name="NiTriShape" inherit="NiTriBasedGeom">
+    <niobject name="NiTriShape" inherit="NiTriBasedGeom" module="NiMain">
         A shape node that refers to singular triangle data.
     </niobject>
 
-    <niobject name="NiTriShapeData" inherit="NiTriBasedGeomData">
+    <niobject name="NiTriShapeData" inherit="NiTriBasedGeomData" module="NiMain">
         Holds mesh data using a list of singular triangles.
         <add name="Num Triangle Points" type="uint">Num Triangles times 3.</add>
         <add name="Has Triangles" type="bool" ver1="10.1.0.0">Do we have triangle data?</add>
@@ -5030,11 +5046,11 @@
         <add name="Match Groups" type="MatchGroup" arr1="Num Match Groups" ver1="3.1">The shared normals.</add>
     </niobject>
 
-    <niobject name="NiTriStrips" inherit="NiTriBasedGeom">
+    <niobject name="NiTriStrips" inherit="NiTriBasedGeom" module="NiMain">
         A shape node that refers to data organized into strips of triangles
     </niobject>
 
-    <niobject name="NiTriStripsData" inherit="NiTriBasedGeomData">
+    <niobject name="NiTriStripsData" inherit="NiTriBasedGeomData" module="NiMain">
         Holds mesh data using strips of triangles.
         <add name="Num Strips" type="ushort">Number of OpenGL triangle strips that are present.</add>
         <add name="Strip Lengths" type="ushort" arr1="Num Strips">The number of points in each triangle strip.</add>
@@ -5043,7 +5059,7 @@
         <add name="Points" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="Has Points" ver1="10.0.1.3">The points in the Triangle strips. Size is the sum of all entries in Strip Lengths.</add>
     </niobject>
 
-    <niobject name="NiEnvMappedTriShape" inherit="NiObjectNET" until="V10_0_1_0">
+    <niobject name="NiEnvMappedTriShape" inherit="NiObjectNET" module="NiLegacy" until="V10_0_1_0">
         Unknown
         <add name="Unknown 1" type="ushort" />
         <add name="Unknown Matrix" type="Matrix44" />
@@ -5053,11 +5069,11 @@
         <add name="Child 3" type="Ref" template="NiObject" />
     </niobject>
 
-    <niobject name="NiEnvMappedTriShapeData" inherit="NiTriShapeData" until="V10_0_1_0">
+    <niobject name="NiEnvMappedTriShapeData" inherit="NiTriShapeData" module="NiLegacy" until="V10_0_1_0">
         Holds mesh data using a list of singular triangles.
     </niobject>
 
-    <niobject name="NiBezierTriangle4" inherit="NiObject" until="V10_0_1_0">
+    <niobject name="NiBezierTriangle4" inherit="NiObject" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1)
         Sub data of NiBezierMesh
         <add name="Unknown 1" type="uint" arr1="6" />
@@ -5071,7 +5087,7 @@
         <add name="Unknown 6" type="short" arr1="24" />
     </niobject>
 
-    <niobject name="NiBezierMesh" inherit="NiAVObject" until="V10_0_1_0">
+    <niobject name="NiBezierMesh" inherit="NiAVObject" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1)
         Unknown
         <add name="Num Bezier Triangles" type="uint" />
@@ -5087,13 +5103,13 @@
         <add name="Data 2" type="ushort" arr1="Count 2" arr2="4" />
     </niobject>
 
-    <niobject name="NiClod" inherit="NiTriBasedGeom" until="V4_0_0_2">
+    <niobject name="NiClod" inherit="NiTriBasedGeom" module="NiLegacy" until="V4_0_0_2">
         A shape node that holds continuous level of detail information.
         Seems to be specific to Freedom Force.
         Found in: Freedom Force, Spellbinder
     </niobject>
 
-    <niobject name="NiClodData" inherit="NiTriBasedGeomData" until="V4_0_0_2">
+    <niobject name="NiClodData" inherit="NiTriBasedGeomData" module="NiLegacy" until="V4_0_0_2">
         Holds mesh data for continuous level of detail shapes.
         Presumably a progressive mesh with triangles specified by edge splits.
         Found in: Freedom Force, Spellbinder
@@ -5108,19 +5124,19 @@
         <add name="Unknown Clod Shorts 3" type="ushort" arr1="Unknown Count 3" arr2="6" />
     </niobject>
 
-    <niobject name="NiClodSkinInstance" inherit="NiSkinInstance" until="V4_0_0_2">
+    <niobject name="NiClodSkinInstance" inherit="NiSkinInstance" module="NiLegacy" until="V4_0_0_2">
         A copy of NiSkinInstance for use with NiClod meshes.
         Found in: Freedom Force, Spellbinder
     </niobject>
 
-    <niobject name="NiUVController" inherit="NiTimeController" until="V20_2_0_8">
+    <niobject name="NiUVController" inherit="NiTimeController" module="NiAnimation" until="V20_2_0_8">
         DEPRECATED (pre-10.1), REMOVED (20.3).
         Time controller for texture coordinates.
         <add name="Unknown Short" type="ushort" />
         <add name="Data" type="Ref" template="NiUVData">Texture coordinate controller data index.</add>
     </niobject>
 
-    <niobject name="NiUVData" inherit="NiObject" until="V20_2_0_8">
+    <niobject name="NiUVData" inherit="NiObject" module="NiAnimation" until="V20_2_0_8">
         DEPRECATED (pre-10.1), REMOVED (20.3)
         Texture coordinate data.
         <add name="UV Groups" type="KeyGroup" template="float" arr1="4">
@@ -5128,20 +5144,20 @@
         </add>
     </niobject>
 
-    <niobject name="NiVectorExtraData" inherit="NiExtraData">
+    <niobject name="NiVectorExtraData" inherit="NiExtraData" module="NiMain">
         DEPRECATED (20.5).
         Extra data in the form of a vector (as x, y, z, w components).
         <add name="Vector Data" type="Vector4">The vector data.</add>
     </niobject>
 
-    <niobject name="NiVertexColorProperty" inherit="NiProperty">
+    <niobject name="NiVertexColorProperty" inherit="NiProperty" module="NiMain">
         Property of vertex colors. This object is referred to by the root object of the NIF file whenever some NiTriShapeData object has vertex colors with non-default settings; if not present, vertex colors have vertex_mode=2 and lighting_mode=1.
         <add name="Flags" type="VertexColorFlags" />
         <add name="Vertex Mode" type="SourceVertexMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</add>
         <add name="Lighting Mode" type="LightingMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</add>
     </niobject>
 
-    <niobject name="NiVertWeightsExtraData" inherit="NiExtraData">
+    <niobject name="NiVertWeightsExtraData" inherit="NiExtraData" module="NiMain">
         DEPRECATED (10.x), REMOVED (?)
         Not used in skinning.
         Unsure of use - perhaps for morphing animation or gravity.
@@ -5149,19 +5165,19 @@
         <add name="Weight" type="float" arr1="Num Vertices">The vertex weights.</add>
     </niobject>
 
-    <niobject name="NiVisData" inherit="NiObject">
+    <niobject name="NiVisData" inherit="NiObject" module="NiAnimation">
         DEPRECATED (10.2), REMOVED (?), Replaced by NiBoolData.
         Visibility data for a controller.
         <add name="Num Keys" type="uint" />
         <add name="Keys" type="Key" arg="1" template="byte" arr1="Num Keys" />
     </niobject>
 
-    <niobject name="NiWireframeProperty" inherit="NiProperty">
+    <niobject name="NiWireframeProperty" inherit="NiProperty" module="NiMain">
         Allows applications to switch between drawing solid geometry or wireframe outlines.
         <add name="Flags" type="WireframeFlags" />
     </niobject>
 
-    <niobject name="NiZBufferProperty" inherit="NiProperty">
+    <niobject name="NiZBufferProperty" inherit="NiProperty" module="NiMain">
         Allows applications to set the test and write modes of the renderer's Z-buffer and to set the comparison function used for the Z-buffer test.
         <add name="Flags" type="ZBufferFlags" default="3" />
         <add name="Function" type="TestFunction" default="TEST_LESS_EQUAL" ver1="4.1.0.12" ver2="20.0.0.5">
@@ -5169,11 +5185,11 @@
         </add>
     </niobject>
 
-    <niobject name="RootCollisionNode" inherit="NiNode" versions="V4_0_0_2">
+    <niobject name="RootCollisionNode" inherit="NiNode" module="BSLegacy" versions="V4_0_0_2">
         Morrowind-specific node for collision mesh.
     </niobject>
 
-    <niobject name="NiRawImageData" inherit="NiObject" until="V3_1">
+    <niobject name="NiRawImageData" inherit="NiObject" module="NiLegacy" until="V3_1">
         LEGACY (pre-10.1)
         Raw image data.
         <add name="Width" type="uint">Image width</add>
@@ -5183,21 +5199,21 @@
         <add name="RGBA Image Data" type="ByteColor4" arr1="Width" arr2="Height" cond="Image Type == 2" >Image pixel data.</add>
     </niobject>
     
-    <niobject name="NiAccumulator" abstract="true" inherit="NiObject" />
+    <niobject name="NiAccumulator" abstract="true" inherit="NiObject" module="NiMain" />
 
-    <niobject name="NiSortAdjustNode" inherit="NiNode">
+    <niobject name="NiSortAdjustNode" inherit="NiNode" module="NiMain">
         Used to turn sorting off for individual subtrees in a scene. Useful if objects must be drawn in a fixed order.
         <add name="Sorting Mode" type="SortingMode" default="SORTING_INHERIT">Sorting</add>
         <add name="Accumulator" type="Ref" template="NiAccumulator" ver2="20.0.0.3" />
     </niobject>
 
-    <niobject name="NiSourceCubeMap" inherit="NiSourceTexture">
+    <niobject name="NiSourceCubeMap" inherit="NiSourceTexture" module="NiLegacy">
         Represents cube maps that are created from either a set of six image files, six blocks of pixel data, or a single pixel data with six faces.
     </niobject>
 
     <!-- NiPhysX -->
 
-    <niobject name="NiPhysXScene" inherit="NiObjectNET" since="V20_2_0_8">
+    <niobject name="NiPhysXScene" inherit="NiObjectNET" module="NiPhysX" since="V20_2_0_8">
         Object which manages a NxScene object and the Gamebryo objects that interact with it.
         <add name="Scene Transform" type="NiTransform" />
         <add name="PhysX to World Scale" type="float" default="1.0" />
@@ -5326,7 +5342,7 @@
         <add name="Grid Hash Table Power" type="uint" default="8" />
     </compound>
 
-    <niobject name="NiPhysXSceneDesc" inherit="NiObject" since="V20_2_0_8">
+    <niobject name="NiPhysXSceneDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         Object which caches the properties of NxScene, stored as a snapshot in a NiPhysXScene.
         <add name="Broad Phase Type" type="NiSceneDescNxBroadPhaseType" ver2="20.2.0.7" />
         <add name="Gravity" type="Vector3" />
@@ -5381,7 +5397,7 @@
         <add name="Compartments" type="NxCompartmentDescMap" arr1="Num Compartments" ver1="20.3.0.6" />
     </niobject>
 
-    <niobject name="NiPhysXProp" inherit="NiObjectNET" since="V20_2_0_8">
+    <niobject name="NiPhysXProp" inherit="NiObjectNET" module="NiPhysX" since="V20_2_0_8">
         A PhysX prop which holds information about PhysX actors in a Gamebryo scene
         <add name="PhysX to World Scale" type="float" default="1.0" />
         <add name="Num Sources" type="uint" />
@@ -5395,7 +5411,7 @@
         <add name="Snapshot" type="Ref" template="NiPhysXPropDesc" />
     </niobject>
 
-    <niobject name="NiPhysXPropDesc" inherit="NiObject" since="V20_2_0_8">
+    <niobject name="NiPhysXPropDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serialization of PhysX objects and to attach them to the scene.
         <add name="Num Actors" type="uint" />
         <add name="Actors" type="Ref" template="NiPhysXActorDesc" arr1="Num Actors" />
@@ -5410,7 +5426,7 @@
         <add name="Flags" type="byte" ver1="20.4.0.0" />
     </niobject>
 
-    <niobject name="NiPhysXActorDesc" inherit="NiObject" since="V20_2_0_8">
+    <niobject name="NiPhysXActorDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxActor objects.
         <add name="Actor Name" type="string" />
         <add name="Num Poses" type="uint" />
@@ -5436,7 +5452,7 @@
         <add name="Sleep" type="bool" ver1="30.2.0.3" />
     </compound>
 
-    <niobject name="NiPhysXBodyDesc" inherit="NiObject" since="V20_2_0_8">
+    <niobject name="NiPhysXBodyDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxBodyDesc objects.
         <add name="Local Pose" type="Matrix34" />
         <add name="Space Inertia" type="Vector3" />
@@ -5514,7 +5530,7 @@
         <add name="Limit Plane R" type="float" ver1="20.4.0.0" />
     </compound>
 
-    <niobject name="NiPhysXJointDesc" inherit="NiObject" abstract="true" since="V20_2_0_8">
+    <niobject name="NiPhysXJointDesc" abstract="true" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         A PhysX Joint abstract base class.
         <add name="Joint Type" type="NxJointType" />
         <add name="Joint Name" type="string" />
@@ -5529,7 +5545,7 @@
         <add name="Limits" type="NiPhysXJointLimit" arr1="Num Limits" />
     </niobject>
 
-    <niobject name="NiPhysXD6JointDesc" inherit="NiPhysXJointDesc" since="V20_2_0_8">
+    <niobject name="NiPhysXD6JointDesc" inherit="NiPhysXJointDesc" module="NiPhysX" since="V20_2_0_8">
         A 6DOF (6 degrees of freedom) joint.
         <add name="X Motion" type="NxD6JointMotion" default="MOTION_FREE" />
         <add name="Y Motion" type="NxD6JointMotion" default="MOTION_FREE" />
@@ -5606,7 +5622,7 @@
         <add name="Capsule Flags" type="uint" />
     </compound>
 
-    <niobject name="NiPhysXShapeDesc" inherit="NiObject" since="V20_2_0_8">
+    <niobject name="NiPhysXShapeDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxShapeDesc objects
         <add name="Shape Type" type="NxShapeType" />
         <add name="Local Pose" type="Matrix34" />
@@ -5626,7 +5642,7 @@
         <add name="Mesh" type="Ref" template="NiPhysXMeshDesc" cond="(Shape Type == 5) || (Shape Type == 6)" />
     </niobject>
 
-    <niobject name="NiPhysXMeshDesc" inherit="NiObject" since="V20_2_0_8">
+    <niobject name="NiPhysXMeshDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         Holds mesh data for streaming.
         <add name="Is Convex" type="bool" ver2="20.3.0.4" />
         <add name="Mesh Name" type="string" />
@@ -5672,7 +5688,7 @@
         <add name="Spring" type="NxSpringDesc" ver2="20.2.3.0" cond="Has Spring" />
     </compound>
 
-    <niobject name="NiPhysXMaterialDesc" inherit="NiObject" since="V20_2_0_8">
+    <niobject name="NiPhysXMaterialDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxMaterialDesc objects.
         <add name="Index" type="ushort" />
         <add name="Num States" type="uint" />
@@ -5722,7 +5738,7 @@
         <add name="Positions" type="PhysXClothAttachmentPosition" cond="Num Vertices #GT# 0" arr1="Num Vertices" />
     </compound>
 
-    <niobject name="NiPhysXClothDesc" inherit="NiObject" since="V20_2_0_8">
+    <niobject name="NiPhysXClothDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxClothDesc objects.
         <add name="Name" type="string" />
         <add name="Mesh" type="Ref" template="NiPhysXMeshDesc" />
@@ -5765,45 +5781,45 @@
         <add name="Target Mesh" type="Ref" template="NiMesh" ver2="20.5.0.0" />
     </niobject>
 
-    <niobject name="NiPhysXDest" inherit="NiObject" abstract="true" since="V20_2_0_8">
+    <niobject name="NiPhysXDest" abstract="true" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         A destination is a link between a PhysX actor and a Gamebryo object being driven by the physics.
         <add name="Active" type="bool" default="1" />
         <add name="Interpolate" type="bool" />
     </niobject>
 
-    <niobject name="NiPhysXRigidBodyDest" inherit="NiPhysXDest" abstract="true" since="V20_2_0_8">
+    <niobject name="NiPhysXRigidBodyDest" abstract="true" inherit="NiPhysXDest" module="NiPhysX" since="V20_2_0_8">
         Base for destinations that set a rigid body state.
     </niobject>
 
-    <niobject name="NiPhysXTransformDest" inherit="NiPhysXRigidBodyDest" since="V20_2_0_8">
+    <niobject name="NiPhysXTransformDest" inherit="NiPhysXRigidBodyDest" module="NiPhysX" since="V20_2_0_8">
         Connects PhysX rigid body actors to a scene node.
         <add name="Target" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPhysXSrc" inherit="NiObject" abstract="true" since="V20_2_0_8">
+    <niobject name="NiPhysXSrc" abstract="true" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         A source is a link between a Gamebryo object and a PhysX actor.
         <add name="Active" type="bool" default="1" />
         <add name="Interpolate" type="bool" />
     </niobject>
 
-    <niobject name="NiPhysXRigidBodySrc" inherit="NiPhysXSrc" abstract="true" since="V20_2_0_8">
+    <niobject name="NiPhysXRigidBodySrc" abstract="true" inherit="NiPhysXSrc" module="NiPhysX" since="V20_2_0_8">
         Sets state of a rigid body PhysX actor.
         <add name="Source" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPhysXKinematicSrc" inherit="NiPhysXRigidBodySrc" since="V20_2_0_8">
+    <niobject name="NiPhysXKinematicSrc" inherit="NiPhysXRigidBodySrc" module="NiPhysX" since="V20_2_0_8">
         Sets state of kinematic PhysX actor.
     </niobject>
 
-    <niobject name="NiPhysXDynamicSrc" inherit="NiPhysXRigidBodySrc" since="V20_2_0_8">
+    <niobject name="NiPhysXDynamicSrc" inherit="NiPhysXRigidBodySrc" module="NiPhysX" since="V20_2_0_8">
         Sends Gamebryo scene state to a PhysX dynamic actor.
     </niobject>
 
-    <niobject name="NiLines" inherit="NiTriBasedGeom">
+    <niobject name="NiLines" inherit="NiTriBasedGeom" module="NiMain">
         Wireframe geometry.
     </niobject>
 
-    <niobject name="NiLinesData" inherit="NiGeometryData">
+    <niobject name="NiLinesData" inherit="NiGeometryData" module="NiMain">
         Wireframe geometry data.
         <add name="Lines" type="bool" arr1="Num Vertices">Is vertex connected to other (next?) vertex?</add>
     </niobject>
@@ -5816,7 +5832,7 @@
         <add name="Triangle Offset" type="ushort">Offset in indices array.</add>
     </compound>
 
-    <niobject name="NiScreenElementsData" inherit="NiTriShapeData">
+    <niobject name="NiScreenElementsData" inherit="NiTriShapeData" module="NiMain">
         DEPRECATED (20.5), functionality included in NiMeshScreenElements.
         Two dimensional screen elements.
         <add name="Max Polygons" type="ushort" />
@@ -5830,23 +5846,23 @@
         <add name="Indices Grow By" type="ushort" default="1" />
     </niobject>
 
-    <niobject name="NiScreenElements" inherit="NiTriShape">
+    <niobject name="NiScreenElements" inherit="NiTriShape" module="NiMain">
         DEPRECATED (20.5), replaced by NiMeshScreenElements.
         Two dimensional screen elements.
     </niobject>
 
-    <niobject name="NiRoomGroup" inherit="NiNode">
+    <niobject name="NiRoomGroup" inherit="NiNode" module="NiMain">
         NiRoomGroup represents a set of connected rooms i.e. a game level.
         <add name="Shell" type="Ptr" template="NiNode">Object that represents the room group as seen from the outside.</add>
         <add name="Num Rooms" type="uint" />
         <add name="Rooms" type="Ptr" template="NiRoom" arr1="Num Rooms" />
     </niobject>
 
-    <niobject name="NiWall" inherit="NiNode" until="V3_3_0_13">
+    <niobject name="NiWall" inherit="NiNode" module="NiMain" until="V3_3_0_13">
         <add name="Wall Plane" type="NiPlane" />
     </niobject>
 
-    <niobject name="NiRoom" inherit="NiNode">
+    <niobject name="NiRoom" inherit="NiNode" module="NiMain">
         NiRoom objects represent cells in a cell-portal culling system.
         <add name="Num Walls" type="uint" />
         <add name="Walls" type="Ref" template="NiWall" arr1="Num Walls" ver2="3.3.0.13" />
@@ -5859,7 +5875,7 @@
         <add name="Fixtures" type="Ptr" template="NiAVObject" arr1="Num Fixtures">All geometry associated with the room. Seems to be Ref for legacy.</add>
     </niobject>
 
-    <niobject name="NiPortal" inherit="NiAVObject">
+    <niobject name="NiPortal" inherit="NiAVObject" module="NiMain">
         NiPortal objects are grouping nodes that support aggressive visibility culling.
         They represent flat polygonal regions through which a part of a scene graph can be viewed.
         <add name="Portal Flags" type="ushort" />
@@ -5869,7 +5885,7 @@
         <add name="Adjoiner" type="Ptr" template="NiNode">Root of the scenegraph which is to be seen through this portal.</add>
     </niobject>
 
-    <niobject name="BSFadeNode" inherit="NiNode" versions="#FO3_AND_LATER#">
+    <niobject name="BSFadeNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific fade node.
     </niobject>
 
@@ -5957,7 +5973,7 @@
         <option value="31" name="Unknown10">Unknown</option>
     </bitflags>
     
-    <niobject name="BSShaderProperty" inherit="NiShadeProperty" versions="#FO3_AND_LATER#">
+    <niobject name="BSShaderProperty" inherit="NiShadeProperty" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific property.
         <add name="Shader Type" type="BSShaderType" default="SHADER_DEFAULT" vercond="#NI_BS_LTE_FO3#" />
         <add name="Shader Flags" type="BSShaderFlags" default="0x82000000" vercond="#NI_BS_LTE_FO3#" />
@@ -5965,12 +5981,12 @@
         <add name="Environment Map Scale" type="float" default="1.0" vercond="#NI_BS_LTE_FO3#">Scales the intensity of the environment/cube map.</add>
     </niobject>
 
-    <niobject name="BSShaderLightingProperty" abstract="true" inherit="BSShaderProperty" versions="#FO3#">
+    <niobject name="BSShaderLightingProperty" abstract="true" inherit="BSShaderProperty" module="BSMain" versions="#FO3#">
         Bethesda-specific property.
         <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" vercond="#NI_BS_LTE_FO3#">How to handle texture borders.</add>
     </niobject>
 
-    <niobject name="BSShaderNoLightingProperty" inherit="BSShaderLightingProperty" versions="#FO3#">
+    <niobject name="BSShaderNoLightingProperty" inherit="BSShaderLightingProperty" module="BSMain" versions="#FO3#">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">The texture glow map.</add>
         <add name="Falloff Start Angle" type="float" default="1.0" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
@@ -5979,7 +5995,7 @@
         <add name="Falloff Stop Opacity" type="float" default="0.0" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at end angle</add>
     </niobject>
 
-    <niobject name="BSShaderPPLightingProperty" inherit="BSShaderLightingProperty" versions="#FO3#">
+    <niobject name="BSShaderPPLightingProperty" inherit="BSShaderLightingProperty" module="BSMain" versions="#FO3#">
         Bethesda-specific property.
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set</add>
         <add name="Refraction Strength" type="float" default="0.0" vercond="#BSVER# #GT# 14">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
@@ -5990,35 +6006,35 @@
         <add name="Emissive Color" type="Color4" vercond="#BS_GT_FO3#">Glow color and alpha</add>
     </niobject>
 
-    <niobject name="BSEffectShaderPropertyFloatController" inherit="NiFloatInterpController" versions="#SKY_AND_LATER#">
+    <niobject name="BSEffectShaderPropertyFloatController" inherit="NiFloatInterpController" module="BSAnimation" versions="#SKY_AND_LATER#">
         This controller is used to animate float variables in BSEffectShaderProperty.
         <add name="Controlled Variable" type="EffectShaderControlledVariable">Which float variable in BSEffectShaderProperty to animate.</add>
     </niobject>
 	
-	<niobject name="BSEffectShaderPropertyColorController" inherit="NiPoint3InterpController" versions="#SKY_AND_LATER#">
+	<niobject name="BSEffectShaderPropertyColorController" inherit="NiPoint3InterpController" module="BSAnimation" versions="#SKY_AND_LATER#">
 		This controller is used to animate colors in BSEffectShaderProperty.
 		<add name="Controlled Color" type="EffectShaderControlledColor">Which color in BSEffectShaderProperty to animate.</add>
 	</niobject>
 	
-	<niobject name="BSLightingShaderPropertyFloatController" inherit="NiFloatInterpController" versions="#SKY_AND_LATER#">
+	<niobject name="BSLightingShaderPropertyFloatController" inherit="NiFloatInterpController" module="BSAnimation" versions="#SKY_AND_LATER#">
 		This controller is used to animate float variables in BSLightingShaderProperty.
 		<add name="Controlled Variable" type="LightingShaderControlledFloat">Which float variable in BSLightingShaderProperty to animate.</add>
 	</niobject>
 
-	<niobject name="BSLightingShaderPropertyUShortController" inherit="NiFloatInterpController" versions="#SKY_AND_LATER#">
+	<niobject name="BSLightingShaderPropertyUShortController" inherit="NiFloatInterpController" module="BSAnimation" versions="#SKY_AND_LATER#">
 		This controller is used to animate float variables in BSLightingShaderProperty.
 		NOTE: FO4 CK reports this block as unsupported.
 		<add name="Controlled Variable" type="LightingShaderControlledUShort">NOTE: FO4 CK reports this as unsupported. Which integral variable in BSLightingShaderProperty to animate.</add>
 	</niobject>
 
-	<niobject name="BSLightingShaderPropertyColorController" inherit="NiPoint3InterpController" versions="#SKY_AND_LATER#">
+	<niobject name="BSLightingShaderPropertyColorController" inherit="NiPoint3InterpController" module="BSAnimation" versions="#SKY_AND_LATER#">
 		This controller is used to animate colors in BSLightingShaderProperty.
 		<add name="Controlled Color" type="LightingShaderControlledColor">Which color in BSLightingShaderProperty to animate.</add>
 	</niobject>	
 	
-	<niobject name="BSNiAlphaPropertyTestRefController" inherit="NiFloatInterpController" versions="#BETHESDA#" />
+	<niobject name="BSNiAlphaPropertyTestRefController" inherit="NiFloatInterpController" module="BSAnimation" versions="#BETHESDA#" />
 	
-	<niobject name="BSProceduralLightningController" inherit="NiTimeController" versions="#BETHESDA#">
+	<niobject name="BSProceduralLightningController" inherit="NiTimeController" module="BSAnimation" versions="#BETHESDA#">
     Skyrim, Paired with dummy TriShapes, this controller generates lightning shapes for special effects.
     First interpolator controls Generation.
         <add name="Interpolator 1: Generation" type="Ref" template="NiInterpolator">References generation interpolator.</add>
@@ -6044,7 +6060,7 @@
         <add name="Shader Property" type="Ref" template="BSShaderProperty">Reference to a shader property.</add>
 	</niobject>
 
-   <niobject name="BSShaderTextureSet" inherit="NiObject" versions="#BETHESDA#">
+   <niobject name="BSShaderTextureSet" inherit="NiObject" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific Texture Set.
         <add name="Num Textures" type="uint" default="6" />
         <add name="Textures" type="SizedString" arr1="Num Textures">Textures.
@@ -6059,7 +6075,7 @@
         </add>
     </niobject>
 
-    <niobject name="WaterShaderProperty" inherit="BSShaderProperty" versions="#FO3_AND_LATER#">
+    <niobject name="WaterShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific property. Found in Fallout3
     </niobject>
 
@@ -6072,39 +6088,39 @@
         <option value="5" name="BSSM_SKY_STARS">BSSM_Sky_Stars</option>
         <option value="7" name="BSSM_SKY_MOON_STARS_MASK">BSSM_Sky_Moon_Stars_Mask</option>
     </enum>
-    <niobject name="SkyShaderProperty" inherit="BSShaderLightingProperty" versions="#BETHESDA#">
+    <niobject name="SkyShaderProperty" inherit="BSShaderLightingProperty" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific property. Found in Fallout3
         <add name="File Name" type="SizedString">The texture.</add>
         <add name="Sky Object Type" type="SkyObjectType">Sky Object Type</add>
     </niobject>
 
-    <niobject name="TileShaderProperty" inherit="BSShaderLightingProperty" versions="#FO3#">
+    <niobject name="TileShaderProperty" inherit="BSShaderLightingProperty" module="BSMain" versions="#FO3#">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">Texture file name</add>
     </niobject>
 
-    <niobject name="DistantLODShaderProperty" inherit="BSShaderProperty" versions="#BETHESDA#">
+    <niobject name="DistantLODShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="BSDistantTreeShaderProperty" inherit="BSShaderProperty" versions="#FO3_AND_LATER#">
+    <niobject name="BSDistantTreeShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="TallGrassShaderProperty" inherit="BSShaderProperty" versions="#BETHESDA#">
+    <niobject name="TallGrassShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">Texture file name</add>
     </niobject>
 
-    <niobject name="VolumetricFogShaderProperty" inherit="BSShaderProperty" versions="#FO3_AND_LATER#">
+    <niobject name="VolumetricFogShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="HairShaderProperty" inherit="BSShaderProperty" versions="#BETHESDA#">
+    <niobject name="HairShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific property.
     </niobject>
 
-    <niobject name="Lighting30ShaderProperty" inherit="BSShaderPPLightingProperty" versions="#BETHESDA#">
+    <niobject name="Lighting30ShaderProperty" inherit="BSShaderPPLightingProperty" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific property.
     </niobject>
 
@@ -6252,7 +6268,7 @@
         <option value="31" name="Refraction_Writes_Depth" />
     </bitflags>
 
-    <niobject name="BSLightingShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
+    <niobject name="BSLightingShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Bethesda shader property for Skyrim and later.
         <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="!#BS_FO4#" default="0x82400301">Skyrim Shader Flags for setting render/shader options.</add>
         <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="!#BS_FO4#" default="0x8021">Skyrim Shader Flags for setting render/shader options.</add>
@@ -6302,7 +6318,7 @@
         <add name="Right Eye Reflection Center" type="Vector3" cond="Skyrim Shader Type == 16">Offset to set center for right eye cubemap</add>
     </niobject>
 
-    <niobject name="BSEffectShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
+    <niobject name="BSEffectShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Bethesda effect shader property for Skyrim and later.
         <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="0x80000000" vercond="!#BS_FO4#" />
         <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="0x20" vercond="!#BS_FO4#" />
@@ -6348,7 +6364,7 @@
         <option value="13" name="CUBEMAP" />
     </bitflags>
     
-    <niobject name="BSWaterShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
+    <niobject name="BSWaterShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Skyrim water shader property, different from "WaterShaderProperty" seen in Fallout.
         <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000008" />
         <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" />
@@ -6357,7 +6373,7 @@
         <add name="Water Shader Flags" type="WaterShaderPropertyFlags" default="0xC4" />
     </niobject>
     
-    <niobject name="BSSkyShaderProperty" inherit="BSShaderProperty" versions="#SKY_AND_LATER#">
+    <niobject name="BSSkyShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Skyrim Sky shader block.
         <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000000" />
         <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" />
@@ -6367,19 +6383,19 @@
         <add name="Sky Object Type" type="SkyObjectType" default="BSSM_SKY_CLOUDS" />
     </niobject>
 
-    <niobject name="BSDismemberSkinInstance" inherit="NiSkinInstance" versions="#BETHESDA#">
+    <niobject name="BSDismemberSkinInstance" inherit="NiSkinInstance" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific skin instance.
         <add name="Num Partitions" type="uint" default="1" />
         <add name="Partitions" type="BodyPartList" arr1="Num Partitions" />
     </niobject>
 
-    <niobject name="BSDecalPlacementVectorExtraData" inherit="NiFloatExtraData" versions="#FO3_AND_LATER#">
+    <niobject name="BSDecalPlacementVectorExtraData" inherit="NiFloatExtraData" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific extra data. Lists locations and normals on a mesh that are appropriate for decal placement.
         <add name="Num Vector Blocks" type="ushort" />
         <add name="Vector Blocks" type="DecalVectorArray" arr1="Num Vector Blocks" />
     </niobject>
 
-    <niobject name="BSPSysSimpleColorModifier" inherit="NiPSysModifier" versions="#FO3_AND_LATER#">
+    <niobject name="BSPSysSimpleColorModifier" inherit="NiPSysModifier" module="BSParticle" versions="#FO3_AND_LATER#">
         Bethesda-specific particle modifier.
         <add name="Fade In Percent" type="float" default="0.1" />
         <add name="Fade out Percent" type="float" default="0.9" />
@@ -6397,19 +6413,19 @@
         <option value="1" name="UsePlayerAdjust" />
     </bitflags>
 
-    <niobject name="BSValueNode" inherit="NiNode" versions="#FO3_AND_LATER#">
+    <niobject name="BSValueNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific node. Found on fxFire effects
         <add name="Value" type="uint" />
         <add name="Value Node Flags" type="BSValueNodeFlags" />
     </niobject>
 
 
-    <niobject name="BSStripParticleSystem" inherit="NiParticleSystem" versions="#FO3_AND_LATER#">
+    <niobject name="BSStripParticleSystem" inherit="NiParticleSystem" module="BSParticle" versions="#FO3_AND_LATER#">
         Bethesda-Specific (mesh?) Particle System.
     </niobject>
 
 
-    <niobject name="BSStripPSysData" inherit="NiPSysData" versions="#FO3_AND_LATER#">
+    <niobject name="BSStripPSysData" inherit="NiPSysData" module="BSParticle" versions="#FO3_AND_LATER#">
         Bethesda-Specific (mesh?) Particle System Data.
         <add name="Max Point Count" type="ushort" />
         <add name="Start Cap Size" type="float" />
@@ -6418,19 +6434,19 @@
     </niobject>
 
 
-    <niobject name="BSPSysStripUpdateModifier" inherit="NiPSysModifier" versions="#FO3_AND_LATER#">
+    <niobject name="BSPSysStripUpdateModifier" inherit="NiPSysModifier" module="BSParticle" versions="#FO3_AND_LATER#">
         Bethesda-Specific (mesh?) Particle System Modifier.
         <add name="Update Delta Time" type="float" default="0.033333" />
     </niobject>
 
 
-    <niobject name="BSMaterialEmittanceMultController" inherit="NiFloatInterpController" versions="#FO3#">
+    <niobject name="BSMaterialEmittanceMultController" inherit="NiFloatInterpController" module="BSAnimation" versions="#FO3#">
         Bethesda-Specific time controller.
     </niobject>
 
 
 
-    <niobject name="BSMasterParticleSystem" inherit="NiNode" versions="#FO3_AND_LATER#">
+    <niobject name="BSMasterParticleSystem" inherit="NiNode" module="BSParticle" versions="#FO3_AND_LATER#">
         Bethesda-Specific particle system.
         <add name="Max Emitter Objects" type="ushort" default="20" />
         <add name="Num Particle Systems" type="uint" />
@@ -6439,47 +6455,47 @@
     </niobject>
 
 
-    <niobject name="BSPSysMultiTargetEmitterCtlr" inherit="NiPSysEmitterCtlr" versions="#FO3_AND_LATER#">
+    <niobject name="BSPSysMultiTargetEmitterCtlr" inherit="NiPSysEmitterCtlr" module="BSParticle" versions="#FO3_AND_LATER#">
         Particle system (multi?) emitter controller.
         <add name="Max Emitters" type="ushort" />
         <add name="Master Particle System" type="Ptr" template="BSMasterParticleSystem" />
     </niobject>
 
 
-    <niobject name="BSRefractionStrengthController" inherit="NiFloatInterpController" versions="#FO3#">
+    <niobject name="BSRefractionStrengthController" inherit="NiFloatInterpController" module="BSAnimation" versions="#FO3#">
         Bethesda-Specific time controller.
     </niobject>
 
 
-    <niobject name="BSOrderedNode" inherit="NiNode" versions="#FO3_AND_LATER#">
+    <niobject name="BSOrderedNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
         <add name="Alpha Sort Bound" type="Vector4" />
         <add name="Static Bound" type="bool" default="1" />
     </niobject>
 
 
-    <niobject name="BSRangeNode" inherit="NiNode" versions="#FO3_AND_LATER#">
+    <niobject name="BSRangeNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
         <add name="Min" type="byte" />
         <add name="Max" type="byte" />
         <add name="Current" type="byte" />
     </niobject>
 
-    <niobject name="BSBlastNode" inherit="BSRangeNode" versions="#FO3_AND_LATER#">
+    <niobject name="BSBlastNode" inherit="BSRangeNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
     </niobject>
 
-    <niobject name="BSDamageStage" inherit="BSBlastNode" versions="#FO3_AND_LATER#">
+    <niobject name="BSDamageStage" inherit="BSBlastNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
     </niobject>
 
 
-    <niobject name="BSRefractionFirePeriodController" inherit="NiTimeController" versions="#FO3#">
+    <niobject name="BSRefractionFirePeriodController" inherit="NiTimeController" module="BSAnimation" versions="#FO3#">
         Bethesda-specific time controller.
         <add name="Interpolator" type="Ref" template="NiInterpolator" />
     </niobject>
 
-    <niobject name="bhkConvexListShape" inherit="bhkConvexShapeBase" versions="#FO3#">
+    <niobject name="bhkConvexListShape" inherit="bhkConvexShapeBase" module="BSHavok" versions="#FO3#">
         A list of shapes. However,
             - The sub shapes must ALL be convex: Sphere, Capsule, Cylinder, Convex Vertices, Convex Transform
             - The radius of all shapes must be identical
@@ -6508,7 +6524,7 @@
         <add name="Transform 2" type="NiQuatTransform" />
     </compound>
 
-    <niobject name="BSTreadTransfInterpolator" inherit="NiInterpolator" versions="#FO3_AND_LATER#">
+    <niobject name="BSTreadTransfInterpolator" inherit="NiInterpolator" module="BSAnimation" versions="#FO3_AND_LATER#">
         Bethesda-specific interpolator.
         <add name="Num Tread Transforms" type="uint" />
         <add name="Tread Transforms" type="BSTreadTransform" arr1="Num Tread Transforms" />
@@ -6522,7 +6538,7 @@
         <option value="2" name="ANT_LOOKIK">ANT_LOOKIK</option>
     </enum>
 
-    <niobject name="BSAnimNote" inherit="NiObject" versions="#FO3_AND_LATER#">
+    <niobject name="BSAnimNote" inherit="NiObject" module="BSAnimation" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
         <add name="Type" type="AnimNoteType">Type of this note.</add>
         <add name="Time" type="float">Location in time.</add>
@@ -6531,13 +6547,13 @@
         <add name="State" type="uint" cond="Type == 2" />
     </niobject>
 
-    <niobject name="BSAnimNotes" inherit="NiObject" versions="#FO3_AND_LATER#">
+    <niobject name="BSAnimNotes" inherit="NiObject" module="BSAnimation" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
         <add name="Num Anim Notes" type="ushort">Number of BSAnimNote objects.</add>
         <add name="Anim Notes" type="Ref" template="BSAnimNote" arr1="Num Anim Notes">BSAnimNote objects.</add>
     </niobject>
 
-    <niobject name="bhkLiquidAction" inherit="bhkAction" versions="#FO3_AND_LATER#">
+    <niobject name="bhkLiquidAction" inherit="bhkAction" module="BSHavok" versions="#FO3_AND_LATER#">
         Bethesda custom bhkUnaryAction. Does not hold a link to the body like other bhkUnaryActions however.
         <add name="Unused 01" type="byte" arr1="12" binary="true" />
         <add name="Initial Stick Force" type="float" />
@@ -6555,29 +6571,29 @@
         <option value="4" name="BSCP_CULL_FORCEMULTIBOUNDSNOUPDATE">Force Multi Bounds No Update</option>
     </enum>
 
-    <niobject name="BSMultiBoundNode" inherit="NiNode" versions="#FO3_AND_LATER#">
+    <niobject name="BSMultiBoundNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific node.
         <add name="Multi Bound" type="Ref" template="BSMultiBound" />
 		<add name="Culling Mode" type="BSCPCullingType" vercond="#BS_GTE_SKY#" />
     </niobject>
 
-    <niobject name="BSMultiBound" inherit="NiObject" versions="#FO3_AND_LATER#">
+    <niobject name="BSMultiBound" inherit="NiObject" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
         <add name="Data" type="Ref" template="BSMultiBoundData" />
     </niobject>
 
-    <niobject name="BSMultiBoundData" inherit="NiObject" versions="#FO3_AND_LATER#">
+    <niobject name="BSMultiBoundData" inherit="NiObject" module="BSMain" versions="#FO3_AND_LATER#">
         Abstract base type for bounding data.
     </niobject>
 
-    <niobject name="BSMultiBoundOBB" inherit="BSMultiBoundData" versions="#FO3_AND_LATER#">
+    <niobject name="BSMultiBoundOBB" inherit="BSMultiBoundData" module="BSMain" versions="#FO3_AND_LATER#">
         Oriented bounding box.
         <add name="Center" type="Vector3">Center of the box.</add>
         <add name="Size" type="Vector3">Size of the box along each axis.</add>
         <add name="Rotation" type="Matrix33">Rotation of the bounding box.</add>
     </niobject>
     
-    <niobject name="BSMultiBoundSphere" inherit="BSMultiBoundData" versions="#FO3_AND_LATER#">
+    <niobject name="BSMultiBoundSphere" inherit="BSMultiBoundData" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
         <add name="Center" type="Vector3" />
         <add name="Radius" type="float" />
@@ -6603,13 +6619,13 @@
         <add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="#BS_FO4#" />
     </compound>
 
-    <niobject name="BSSegmentedTriShape" inherit="NiTriShape" versions="#FO3_AND_LATER#">
+    <niobject name="BSSegmentedTriShape" inherit="NiTriShape" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific AV object.
         <add name="Num Segments" type="uint" >Number of segments in the square grid</add>
         <add name="Segment" type="BSGeometrySegmentData" arr1="Num Segments">Configuration of each segment</add>
     </niobject>
 
-    <niobject name="BSMultiBoundAABB" inherit="BSMultiBoundData" versions="#FO3_AND_LATER#">
+    <niobject name="BSMultiBoundAABB" inherit="BSMultiBoundData" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
         <add name="Position" type="Vector3">Position of the AABB's center</add>
         <add name="Extent" type="Vector3">Extent of the AABB in all directions</add>
@@ -6642,7 +6658,7 @@
         <add name="Data Block" type="NiAGDDataBlock" cond="Has Data" arg="#ARG#" />
     </compound>
 
-    <niobject name="NiAdditionalGeometryData" inherit="AbstractAdditionalGeometryData">
+    <niobject name="NiAdditionalGeometryData" inherit="AbstractAdditionalGeometryData" module="NiMain">
         <add name="Num Vertices" type="ushort" />
         <add name="Num Block Infos" type="uint" />
         <add name="Block Infos" type="NiAGDDataStream" arr1="Num Block Infos" />
@@ -6650,7 +6666,7 @@
         <add name="Blocks" type="NiAGDDataBlocks" arg="0" arr1="Num Blocks" />
     </niobject>
 
-    <niobject name="BSPackedAdditionalGeometryData" inherit="AbstractAdditionalGeometryData" versions="#BETHESDA#">
+    <niobject name="BSPackedAdditionalGeometryData" inherit="AbstractAdditionalGeometryData" module="BSMain" versions="#BETHESDA#">
         No longer appears to occur in any vanilla files. Older versions of FNV had the block in nvdlc01vaultposter01.nif.
         <add name="Num Vertices" type="ushort" />
         <add name="Num Block Infos" type="uint" />
@@ -6659,21 +6675,21 @@
         <add name="Blocks" type="NiAGDDataBlocks" arg="1" arr1="Num Blocks" />
     </niobject>
 
-    <niobject name="BSWArray" inherit="NiExtraData" versions="#FO3_AND_LATER#">
+    <niobject name="BSWArray" inherit="NiExtraData" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific extra data.
         <add name="Num Items" type="uint" />
         <add name="Items" type="int" arr1="Num Items" />
     </niobject>
 
-    <niobject name="BSFrustumFOVController" inherit="NiFloatInterpController" versions="#BETHESDA#">
+    <niobject name="BSFrustumFOVController" inherit="NiFloatInterpController" module="BSAnimation" versions="#BETHESDA#">
         Bethesda-specific time controller.
     </niobject>
 
-    <niobject name="BSDebrisNode" inherit="BSRangeNode" versions="#FO3_AND_LATER#">
+    <niobject name="BSDebrisNode" inherit="BSRangeNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
     </niobject>
 
-    <niobject name="bhkBreakableConstraint" inherit="bhkConstraint" versions="#BETHESDA#">
+    <niobject name="bhkBreakableConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpBreakableConstraintData, a wrapper around hkpConstraintInstance.
         The constraint can "break" i.e. stop applying the forces to each body to keep them constrained.
         <add name="Constraint Data" type="bhkWrappedConstraintData">The wrapped constraint.</add>
@@ -6681,7 +6697,7 @@
         <add name="Remove When Broken" type="bool" default="0">No: Constraint stays active. Yes: Constraint gets removed when breaking threshold is exceeded.</add>
     </niobject>
 
-    <niobject name="bhkOrientHingedBodyAction" inherit="bhkUnaryAction" versions="#BETHESDA#">
+    <niobject name="bhkOrientHingedBodyAction" inherit="bhkUnaryAction" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpReorientAction (or similar). Will try to reorient a body to stay facing a given direction.
         <add name="Unused 02" type="byte" arr1="8" binary="true" />
         <add name="Hinge Axis LS" type="Vector4" default="#X_AXIS#" />
@@ -6691,7 +6707,7 @@
         <add name="Unused 03" type="byte" arr1="8" binary="true" />
     </niobject>
 
-    <niobject name="bhkPoseArray" inherit="NiObject" versions="#FO3_AND_LATER#">
+    <niobject name="bhkPoseArray" inherit="NiObject" module="BSHavok" versions="#FO3_AND_LATER#">
         Found in Fallout 3 .psa files, extra ragdoll info for NPCs/creatures. (usually idleanims\deathposes.psa)
         Defines different kill poses. The game selects the pose randomly and applies it to a skeleton immediately upon ragdolling.
         Poses can be previewed in GECK Object Window-Actor Data-Ragdoll and selecting Pose Matching tab.
@@ -6701,13 +6717,13 @@
         <add name="Poses" type="BonePose" arr1="Num Poses" />
     </niobject>
 
-    <niobject name="bhkRagdollTemplate" inherit="NiExtraData" versions="#FO3_AND_LATER#">
+    <niobject name="bhkRagdollTemplate" inherit="NiExtraData" module="BSHavok" versions="#FO3_AND_LATER#">
         Found in Fallout 3, more ragdoll info?  (meshes\ragdollconstraint\*.rdt)
         <add name="Num Bones" type="uint" />
         <add name="Bones" type="Ref" template="NiObject" arr1="Num Bones" />
     </niobject>
 
-    <niobject name="bhkRagdollTemplateData" inherit="NiObject" versions="#FO3_AND_LATER#">
+    <niobject name="bhkRagdollTemplateData" inherit="NiObject" module="BSHavok" versions="#FO3_AND_LATER#">
         Data for bhkRagdollTemplate
         <add name="Name" type="string" />
         <add name="Mass" type="float" default="9.0" />
@@ -6819,7 +6835,7 @@
     </bitflags>
 
 
-    <niobject name="NiDataStream" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiDataStream" inherit="NiObject" module="NiMesh" since="V20_5_0_0">
         <add name="Usage" type="DataStreamUsage" abstract="true"></add>
         <add name="Access" type="DataStreamAccess" abstract="true"></add>
         <add name="Num Bytes" type="uint">The size in bytes of this data stream.</add>
@@ -6854,7 +6870,7 @@
         <add name="Component Semantics" type="SemanticData" arr1="Num Components">Describes the semantic of each component.</add>
     </compound>
 
-    <niobject name="NiRenderObject" abstract="true" inherit="NiAVObject" since="V20_5_0_0">
+    <niobject name="NiRenderObject" abstract="true" inherit="NiAVObject" module="NiMain" since="V20_5_0_0">
         An object that can be rendered.
         <add name="Material Data" type="MaterialData">Per-material data.</add>
     </niobject>
@@ -6881,7 +6897,7 @@
         <option value="0x8070" name="SYNC_REFLECTIONS">Synchronize after all data necessary to calculate reflections is ready.</option>
     </enum>
 
-    <niobject name="NiMeshModifier" abstract="true" inherit="NiObject">
+    <niobject name="NiMeshModifier" abstract="true" inherit="NiObject" module="NiMesh">
         Base class for mesh modifiers.
         <add name="Num Submit Points" type="uint" />
         <add name="Submit Points" type="SyncPoint" arr1="Num Submit Points">The sync points supported by this mesh modifier for SubmitTasks.</add>
@@ -6929,7 +6945,7 @@
         <add name="Max Primitive Map Index" type="uint">The max value to appear in the Mapped Primitives array.</add>
     </compound>
 
-    <niobject name="NiMesh" inherit="NiRenderObject" since="V20_5_0_0">
+    <niobject name="NiMesh" inherit="NiRenderObject" module="NiMesh" since="V20_5_0_0">
         <add name="Primitive Type" type="MeshPrimitiveType">The primitive type of the mesh, such as triangles or lines.</add>
         <add name="EM Data" type="MeshDataEpicMickey" ver1="20.6.5.0" ver2="20.6.5.0" />
         <add name="Num Submeshes" type="ushort">The number of submeshes contained in this mesh.</add>
@@ -6943,7 +6959,7 @@
         <add name="Extra EM Data" type="ExtraMeshDataEpicMickey" cond="Has Extra EM Data" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 9" />
     </niobject>
 
-    <niobject name="NiMorphWeightsController" inherit="NiInterpController" since="V20_5_0_0">
+    <niobject name="NiMorphWeightsController" inherit="NiInterpController" module="NiAnimation" since="V20_5_0_0">
         Manipulates a mesh with the semantic MORPHWEIGHTS using an NiMorphMeshModifier.
         <add name="Count" type="uint" />
         <add name="Num Interpolators" type="uint" />
@@ -6957,7 +6973,7 @@
         <add name="Normalize Flag" type="uint">Whether or not to normalize the data.</add>
     </compound>
 
-    <niobject name="NiMorphMeshModifier" inherit="NiMeshModifier" since="V20_5_0_0">
+    <niobject name="NiMorphMeshModifier" inherit="NiMeshModifier" module="NiMesh" since="V20_5_0_0">
         Performs linear-weighted blending between a set of target data streams.
         <add name="Flags" type="byte">
             FLAG_RELATIVETARGETS = 0x01
@@ -6973,7 +6989,7 @@
         <add name="Elements" type="ElementReference" arr1="Num Elements">Semantics and normalization of the morphing data stream elements.</add>
     </niobject>
 
-    <niobject name="NiSkinningMeshModifier" inherit="NiMeshModifier" since="V20_5_0_0">
+    <niobject name="NiSkinningMeshModifier" inherit="NiMeshModifier" module="NiMesh" since="V20_5_0_0">
         <add name="Flags" type="ushort">
             USE_SOFTWARE_SKINNING = 0x0001
             RECOMPUTE_BOUNDS = 0x0002
@@ -6986,13 +7002,13 @@
         <add name="Bone Bounds" type="NiBound" cond="Flags #BITAND# 2" arr1="Num Bones">The bounds of the bones.  Only stored if the RECOMPUTE_BOUNDS bit is set.</add>
     </niobject>
 
-    <niobject name="NiMeshHWInstance" inherit="NiAVObject" since="V20_5_0_0">
+    <niobject name="NiMeshHWInstance" inherit="NiAVObject" module="NiMesh" since="V20_5_0_0">
         An instance of a hardware-instanced mesh in a scene graph.
         <add name="Master Mesh" type="Ref" template="NiMesh">The instanced mesh this object represents.</add>
         <add name="Mesh Modifier" type="Ref" template="NiInstancingMeshModifier" />
     </niobject>
 
-    <niobject name="NiInstancingMeshModifier" inherit="NiMeshModifier" since="V20_5_0_0">
+    <niobject name="NiInstancingMeshModifier" inherit="NiMeshModifier" module="NiMesh" since="V20_5_0_0">
         Mesh modifier that provides per-frame instancing capabilities in Gamebryo.
         <add name="Has Instance Nodes" type="bool" />
         <add name="Per Instance Culling" type="bool" />
@@ -7009,7 +7025,7 @@
         <add name="Skin Indices" type="uint" arr1="Num Active Skins" />
     </compound>
 
-    <niobject name="NiSkinningLODController" inherit="NiTimeController">
+    <niobject name="NiSkinningLODController" inherit="NiTimeController" module="NiAnimation" since="V20_5_0_0">
         Defines the levels of detail for a given character and dictates the character's current LOD.
         <add name="Current LOD" type="uint" />
         <add name="Num Bones" type="uint" />
@@ -7038,7 +7054,7 @@
         <option value="16" name="ALIGN_CAMERA" />
     </enum>
 
-    <niobject name="NiPSParticleSystem" inherit="NiMesh" since="V20_5_0_0">
+    <niobject name="NiPSParticleSystem" inherit="NiMesh" module="NiPSParticle" since="V20_5_0_0">
         Represents a particle system.
         <add name="Simulator" type="Ref" template="NiPSSimulator" />
         <add name="Generator" type="Ref" template="NiPSBoundUpdater" />
@@ -7065,7 +7081,7 @@
         <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
-    <niobject name="NiPSMeshParticleSystem" inherit="NiPSParticleSystem" since="V20_5_0_0">
+    <niobject name="NiPSMeshParticleSystem" inherit="NiPSParticleSystem" module="NiPSParticle" since="V20_5_0_0">
         Represents a particle system that uses mesh particles instead of sprite-based particles.
         <add name="Num Generations" type="uint" />
         <add name="Master Particles" type="Ref" template="NiAVObject" arr1="Num Generations" />
@@ -7075,11 +7091,11 @@
 
     <!-- NiPS Generators -->
 
-    <niobject name="NiPSFacingQuadGenerator" inherit="NiMeshModifier" since="V20_5_0_0">
+    <niobject name="NiPSFacingQuadGenerator" inherit="NiMeshModifier" module="NiPSParticle" since="V20_5_0_0">
         A mesh modifier that uses particle system data to generate camera-facing quads.
     </niobject>
 
-    <niobject name="NiPSAlignedQuadGenerator" inherit="NiMeshModifier" since="V20_5_0_0">
+    <niobject name="NiPSAlignedQuadGenerator" inherit="NiMeshModifier" module="NiPSParticle" since="V20_5_0_0">
         A mesh modifier that uses particle system data to generate aligned quads for each particle.
         <add name="Scale Amount U" type="float" />
         <add name="Scale Limit U" type="float" default="10000.0" />
@@ -7103,13 +7119,13 @@
 
     <!-- NiPS Simulators -->
 
-    <niobject name="NiPSSimulator" inherit="NiMeshModifier" since="V20_5_0_0">
+    <niobject name="NiPSSimulator" inherit="NiMeshModifier" module="NiPSParticle" since="V20_5_0_0">
         The mesh modifier that performs all particle system simulation.
         <add name="Num Simulation Steps" type="uint" />
         <add name="Simulation Steps" type="Ref" template="NiPSSimulatorStep" arr1="Num Simulation Steps" />
     </niobject>
 
-    <niobject name="NiPSSimulatorStep" inherit="NiObject" abstract="true" since="V20_5_0_0">
+    <niobject name="NiPSSimulatorStep" abstract="true" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for a single step in the particle system simulation process.  It has no seralized data.
     </niobject>
 
@@ -7121,7 +7137,7 @@
         <option name="PS_LOOP_REFLECT" value="4">The time is reflection looped, as if the keys played forward then backward the forward then backward etc for all time.</option>
     </enum>
 
-    <niobject name="NiPSSimulatorGeneralStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
+    <niobject name="NiPSSimulatorGeneralStep" inherit="NiPSSimulatorStep" module="NiPSParticle" since="V20_5_0_0">
         Encapsulates a floodgate kernel that updates particle size, colors, and rotations.
         <add name="Num Size Keys" type="byte" ver1="20.6.1.0" />
         <add name="Size Keys" type="Key" template="float" arg="1" arr1="Num Size Keys" ver1="20.6.1.0">The particle size keys.</add>
@@ -7139,30 +7155,30 @@
         <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
-    <niobject name="NiPSSimulatorForcesStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
+    <niobject name="NiPSSimulatorForcesStep" inherit="NiPSSimulatorStep" module="NiPSParticle" since="V20_5_0_0">
         Encapsulates a floodgate kernel that simulates particle forces.
         <add name="Num Forces" type="uint" />
         <add name="Forces" type="Ref" template="NiPSForce" arr1="Num Forces">The forces affecting the particle system.</add>
     </niobject>
 
-    <niobject name="NiPSSimulatorCollidersStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
+    <niobject name="NiPSSimulatorCollidersStep" inherit="NiPSSimulatorStep" module="NiPSParticle" since="V20_5_0_0">
         Encapsulates a floodgate kernel that simulates particle colliders.
         <add name="Num Colliders" type="uint" />
         <add name="Colliders" type="Ref" template="NiPSCollider" arr1="Num Colliders">The colliders affecting the particle system.</add>
     </niobject>
 
-    <niobject name="NiPSSimulatorMeshAlignStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
+    <niobject name="NiPSSimulatorMeshAlignStep" inherit="NiPSSimulatorStep" module="NiPSParticle" since="V20_5_0_0">
         Encapsulates a floodgate kernel that updates mesh particle alignment and transforms.
         <add name="Num Rotation Keys" type="byte" />
         <add name="Rotation Keys" type="QuatKey" template="Quaternion" arg="1" arr1="Num Rotation Keys">The particle rotation keys.</add>
         <add name="Rotation Loop Behavior" type="PSLoopBehavior">The loop behavior for the rotation keys.</add>
     </niobject>
 
-    <niobject name="NiPSSimulatorFinalStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
+    <niobject name="NiPSSimulatorFinalStep" inherit="NiPSSimulatorStep" module="NiPSParticle" since="V20_5_0_0">
         Encapsulates a floodgate kernel that updates particle positions and ages. As indicated by its name, this step should be attached last in the NiPSSimulator mesh modifier.
     </niobject>
 
-    <niobject name="NiPSBoundUpdater" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiPSBoundUpdater" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Updates the bounding volume for an NiPSParticleSystem object.
         <add name="Update Skip" type="ushort">Number of particle bounds to skip updating every frame. Higher = more updates each frame.</add>
     </niobject>
@@ -7182,14 +7198,14 @@
         <option value="8" name="FORCE_GRAVITY" />
     </enum>
 
-    <niobject name="NiPSForce" abstract="true" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiPSForce" abstract="true" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle forces.
         <add name="Name" type="string" />
         <add name="Type" type="PSForceType" />
         <add name="Active" type="bool" />
     </niobject>
 
-    <niobject name="NiPSFieldForce" abstract="true" inherit="NiPSForce" since="V20_5_0_0">
+    <niobject name="NiPSFieldForce" abstract="true" inherit="NiPSForce" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle field forces.
         <add name="Field Object" type="Ref" template="NiAVObject" />
         <add name="Magnitude" type="float" />
@@ -7198,7 +7214,7 @@
         <add name="Max Distance" type="float" />
     </niobject>
 
-    <niobject name="NiPSDragForce" inherit="NiPSForce" since="V20_5_0_0">
+    <niobject name="NiPSDragForce" inherit="NiPSForce" module="NiPSParticle" since="V20_5_0_0">
         Applies a linear drag force to particles.
         <add name="Drag Axis" type="Vector3" default="#X_AXIS#" />
         <add name="Percentage" type="float" default="0.05" />
@@ -7207,7 +7223,7 @@
         <add name="Drag Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSGravityForce" inherit="NiPSForce" since="V20_5_0_0">
+    <niobject name="NiPSGravityForce" inherit="NiPSForce" module="NiPSParticle" since="V20_5_0_0">
         Applies a gravitational force to particles.
         <add name="Gravity Axis" type="Vector3" default="#X_AXIS#" />
         <add name="Decay" type="float" />
@@ -7218,7 +7234,7 @@
         <add name="Gravity Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSBombForce" inherit="NiPSForce" since="V20_5_0_0">
+    <niobject name="NiPSBombForce" inherit="NiPSForce" module="NiPSParticle" since="V20_5_0_0">
         Applies an explosive force to particles.
         <add name="Bomb Axis" type="Vector3" default="#X_AXIS#" />
         <add name="Decay" type="float" />
@@ -7228,7 +7244,7 @@
         <add name="Bomb Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSAirFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
+    <niobject name="NiPSAirFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of air movements.
         <add name="Direction" type="Vector3" />
         <add name="Air Friction" type="float" />
@@ -7238,37 +7254,37 @@
         <add name="Spread" type="float" />
     </niobject>
 
-    <niobject name="NiPSGravityFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
+    <niobject name="NiPSGravityFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of directional gravity.
         <add name="DEM Unknown Short" type="ushort" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
         <add name="Direction" type="Vector3" default="#X_AXIS#" />
         <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
-    <niobject name="NiPSDragFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
+    <niobject name="NiPSDragFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of drag.
         <add name="Use Direction" type="bool" />
         <add name="Direction" type="Vector3" default="#X_AXIS#" />
     </niobject>
 
-    <niobject name="NiPSRadialFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
+    <niobject name="NiPSRadialFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of point gravity.
         <add name="Radial Factor" type="float" />
     </niobject>
 
-    <niobject name="NiPSTurbulenceFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
+    <niobject name="NiPSTurbulenceFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of turbulence.
         <add name="Frequency" type="float" />
     </niobject>
 
-    <niobject name="NiPSVortexFieldForce" inherit="NiPSFieldForce" since="V20_5_0_0">
+    <niobject name="NiPSVortexFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of a vortex.
         <add name="Direction" type="Vector3" default="#X_AXIS#" />
     </niobject>
 
     <!-- NiPS Emitters -->
 
-    <niobject name="NiPSEmitter" abstract="true" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiPSEmitter" abstract="true" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle emitters.
         <add name="Name" type="string" />
         <add name="Speed" type="float" />
@@ -7293,37 +7309,37 @@
         <add name="Unknown" type="bool" ver1="30.0.0.0" ver2="30.0.0.1" />
     </niobject>
 
-    <niobject name="NiPSVolumeEmitter" abstract="true" inherit="NiPSEmitter" since="V20_5_0_0">
+    <niobject name="NiPSVolumeEmitter" abstract="true" inherit="NiPSEmitter" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for particle emitters that emit particles from a volume.
         <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
         <add name="Emitter Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSBoxEmitter" inherit="NiPSVolumeEmitter" since="V20_5_0_0">
+    <niobject name="NiPSBoxEmitter" inherit="NiPSVolumeEmitter" module="NiPSParticle" since="V20_5_0_0">
         A particle emitter that emits particles from a rectangular volume.
         <add name="Emitter Width" type="float" />
         <add name="Emitter Height" type="float" />
         <add name="Emitter Depth" type="float" />
     </niobject>
 
-    <niobject name="NiPSSphereEmitter" inherit="NiPSVolumeEmitter" since="V20_5_0_0">
+    <niobject name="NiPSSphereEmitter" inherit="NiPSVolumeEmitter" module="NiPSParticle" since="V20_5_0_0">
         A particle emitter that emits particles from a spherical volume.
         <add name="Emitter Radius" type="float" />
     </niobject>
 
-    <niobject name="NiPSCylinderEmitter" inherit="NiPSVolumeEmitter" since="V20_5_0_0">
+    <niobject name="NiPSCylinderEmitter" inherit="NiPSVolumeEmitter" module="NiPSParticle" since="V20_5_0_0">
         A particle emitter that emits particles from a cylindrical volume.
         <add name="Emitter Radius" type="float" />
         <add name="Emitter Height" type="float" />
     </niobject>
 
-    <niobject name="NiPSTorusEmitter" inherit="NiPSVolumeEmitter" since="V20_5_0_0">
+    <niobject name="NiPSTorusEmitter" inherit="NiPSVolumeEmitter" module="NiPSParticle" since="V20_5_0_0">
         A particle emitter that emits particles from a toroidal volume.
         <add name="Emitter Radius" type="float" />
         <add name="Emitter Section Radius" type="float" />
     </niobject>
 
-    <niobject name="NiPSMeshEmitter" inherit="NiPSEmitter" since="V20_5_0_0">
+    <niobject name="NiPSMeshEmitter" inherit="NiPSEmitter" module="NiPSParticle" since="V20_5_0_0">
         Emits particles from one or more NiMesh objects. A random mesh emitter is selected for each particle emission.
         <add name="Num Mesh Emitters" type="uint" />
         <add name="Mesh Emitters" type="Ptr" template="NiMesh" arr1="Num Mesh Emitters" />
@@ -7333,7 +7349,7 @@
         <add name="Initial Velocity Type" type="VelocityType" />
     </niobject>
 
-    <niobject name="NiPSCurveEmitter" inherit="NiPSEmitter" since="V20_5_0_0">
+    <niobject name="NiPSCurveEmitter" inherit="NiPSEmitter" module="NiPSParticle" since="V20_5_0_0">
         Emits particles from a curve.
         <add name="Has Curve" type="bool" />
         <add name="Curve" type="NiCurve3" cond="Has Curve" />
@@ -7343,98 +7359,98 @@
 
     <!-- NiPS Controllers -->
 
-    <niobject name="NiPSEmitterCtlr" abstract="true" inherit="NiSingleInterpController" since="V20_5_0_0">
+    <niobject name="NiPSEmitterCtlr" abstract="true" inherit="NiSingleInterpController" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle emitter time controllers.
         <add name="Emitter Name" type="string" />
     </niobject>
 
-    <niobject name="NiPSEmitterFloatCtlr" abstract="true" inherit="NiPSEmitterCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterFloatCtlr" abstract="true" inherit="NiPSEmitterCtlr" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for controllers that animate a floating point value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitParticlesCtlr" inherit="NiPSEmitterCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitParticlesCtlr" inherit="NiPSEmitterCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates particle emission and birth rate.
         <add name="Emitter Active Interpolator" type="Ref" template="NiInterpolator" />
     </niobject>
 
-    <niobject name="NiPSForceCtlr" abstract="true" inherit="NiSingleInterpController" since="V20_5_0_0">
+    <niobject name="NiPSForceCtlr" abstract="true" inherit="NiSingleInterpController" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle force time controllers.
         <add name="Force Name" type="string" />
     </niobject>
 
-    <niobject name="NiPSForceBoolCtlr" abstract="true" inherit="NiPSForceCtlr" since="V20_5_0_0">
+    <niobject name="NiPSForceBoolCtlr" abstract="true" inherit="NiPSForceCtlr" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for controllers that animate a Boolean value on an NiPSForce object.
     </niobject>
 
-    <niobject name="NiPSForceFloatCtlr" abstract="true" inherit="NiPSForceCtlr" since="V20_5_0_0">
+    <niobject name="NiPSForceFloatCtlr" abstract="true" inherit="NiPSForceCtlr" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for controllers that animate a floating point value on an NiPSForce object.
     </niobject>
 
-    <niobject name="NiPSForceActiveCtlr" inherit="NiPSForceBoolCtlr" since="V20_5_0_0">
+    <niobject name="NiPSForceActiveCtlr" inherit="NiPSForceBoolCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates whether or not an NiPSForce object is active.
     </niobject>
 
-    <niobject name="NiPSGravityStrengthCtlr" inherit="NiPSForceFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSGravityStrengthCtlr" inherit="NiPSForceFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the strength value of an NiPSGravityForce object.
     </niobject>
 
-    <niobject name="NiPSFieldAttenuationCtlr" inherit="NiPSForceFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSFieldAttenuationCtlr" inherit="NiPSForceFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the attenuation value of an NiPSFieldForce object.
     </niobject>
 
-    <niobject name="NiPSFieldMagnitudeCtlr" inherit="NiPSForceFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSFieldMagnitudeCtlr" inherit="NiPSForceFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the magnitude value of an NiPSFieldForce object.
     </niobject>
 
-    <niobject name="NiPSFieldMaxDistanceCtlr" inherit="NiPSForceFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSFieldMaxDistanceCtlr" inherit="NiPSForceFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the max distance value of an NiPSFieldForce object.
     </niobject>
 
-    <niobject name="NiPSEmitterSpeedCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterSpeedCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the speed value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterRadiusCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterRadiusCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the size value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterDeclinationCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterDeclinationCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the declination value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterDeclinationVarCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterDeclinationVarCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the declination variation value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterPlanarAngleCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterPlanarAngleCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the planar angle value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterPlanarAngleVarCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterPlanarAngleVarCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the planar angle variation value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterRotAngleCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterRotAngleCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the rotation angle value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterRotAngleVarCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterRotAngleVarCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the rotation angle variation value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterRotSpeedCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterRotSpeedCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the rotation speed value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterRotSpeedVarCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterRotSpeedVarCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the rotation speed variation value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSEmitterLifeSpanCtlr" inherit="NiPSEmitterFloatCtlr" since="V20_5_0_0">
+    <niobject name="NiPSEmitterLifeSpanCtlr" inherit="NiPSEmitterFloatCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates the lifespan value on an NiPSEmitter object.
     </niobject>
 
-    <niobject name="NiPSResetOnLoopCtlr" inherit="NiTimeController" since="V20_5_0_0">
+    <niobject name="NiPSResetOnLoopCtlr" inherit="NiTimeController" module="NiPSParticle" since="V20_5_0_0">
         Calls ResetParticleSystem on an NiPSParticleSystem target upon looping.
     </niobject>
 
@@ -7446,7 +7462,7 @@
         <option value="1" name="COLLIDER_SPHERICAL" />
     </enum>
 
-    <niobject name="NiPSCollider" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiPSCollider" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle colliders.
         <add name="Spawner" type="Ref" template="NiPSSpawner" />
         <add name="Type" type="ColliderType" />
@@ -7456,7 +7472,7 @@
         <add name="Die on Collide" type="bool" />
     </niobject>
 
-    <niobject name="NiPSPlanarCollider" inherit="NiPSCollider" since="V20_5_0_0">
+    <niobject name="NiPSPlanarCollider" inherit="NiPSCollider" module="NiPSParticle" since="V20_5_0_0">
         A planar collider for particles.
         <add name="Width" type="float" default="1.0" />
         <add name="Height" type="float" default="1.0" />
@@ -7465,13 +7481,13 @@
         <add name="Collider Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSSphericalCollider" inherit="NiPSCollider" since="V20_5_0_0">
+    <niobject name="NiPSSphericalCollider" inherit="NiPSCollider" module="NiPSParticle" since="V20_5_0_0">
         A spherical collider for particles.
         <add name="Radius" type="float" default="1.0" />
         <add name="Collider Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
-    <niobject name="NiPSSpawner" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiPSSpawner" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Creates a new particle whose initial parameters are based on an existing particle.
         <add name="Master Particle System" type="Ptr" template="NiPSParticleSystem" ver1="20.6.1.0" />
         <add name="Percentage Spawned" type="float" default="1.0" />
@@ -7487,7 +7503,7 @@
 
     <!-- NiPhysXPS -->
 
-    <niobject name="NiPhysXPSParticleSystem" inherit="NiPSParticleSystem" since="V20_5_0_0">
+    <niobject name="NiPhysXPSParticleSystem" inherit="NiPSParticleSystem" module="NiPhysX" since="V20_5_0_0">
         Implements Gamebryo particle systems that use PhysX actors for the particles
         <add name="Prop" type="Ptr" template="NiPhysXPSParticleSystemProp" />
         <add name="Dest" type="Ptr" template="NiPhysXPSParticleSystemDest" />
@@ -7500,32 +7516,32 @@
         <add name="Actor" type="Ptr" template="NiPhysXActorDesc" />
     </niobject>
 
-    <niobject name="NiPhysXPSParticleSystemProp" inherit="NiPhysXProp" since="V20_5_0_0">
+    <niobject name="NiPhysXPSParticleSystemProp" inherit="NiPhysXProp" module="NiPhysX" since="V20_5_0_0">
         A PhysX prop which holds information about a PhysX particle system prop.
         <add name="Num Systems" type="uint" />
         <add name="Systems" type="Ptr" template="NiPhysXPSParticleSystem" arr1="Num Systems" />
     </niobject>
 
-    <niobject name="NiPhysXPSParticleSystemDest" inherit="NiPhysXDest" since="V20_5_0_0">
+    <niobject name="NiPhysXPSParticleSystemDest" inherit="NiPhysXDest" module="NiPhysX" since="V20_5_0_0">
         An object which interfaces between the PhysX scene and the Gamebryo particle system.
         <add name="Target" type="Ptr" template="NiPSParticleSystem" />
     </niobject>
 
-    <niobject name="NiPhysXPSSimulator" inherit="NiPSSimulator" since="V20_5_0_0">
+    <niobject name="NiPhysXPSSimulator" inherit="NiPSSimulator" module="NiPhysX" since="V20_5_0_0">
         Adds additional sync points to a NiPSSimulator mesh modifier.
     </niobject>
 
-    <niobject name="NiPhysXPSSimulatorInitialStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
+    <niobject name="NiPhysXPSSimulatorInitialStep" inherit="NiPSSimulatorStep" module="NiPhysX" since="V20_5_0_0">
         Used to set the post-simulation state of particles in a physics-enabled particle system.
     </niobject>
 
-    <niobject name="NiPhysXPSSimulatorFinalStep" inherit="NiPSSimulatorStep" since="V20_5_0_0">
+    <niobject name="NiPhysXPSSimulatorFinalStep" inherit="NiPSSimulatorStep" module="NiPhysX" since="V20_5_0_0">
         Used to push the results of the particle system update into the PhysX actors.
     </niobject>
 
     <!-- NiEvaluator -->
 
-    <niobject name="NiEvaluator" abstract="true" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiEvaluator" abstract="true" inherit="NiObject" module="NiAnimation" since="V20_5_0_0">
         <add name="Node Name" type="string">The name of the animated NiAVObject.</add>
         <add name="Property Type" type="string">The RTTI type of the NiProperty the controller is attached to, if applicable.</add>
         <add name="Controller Type" type="string">The RTTI type of the NiTimeController.</add>
@@ -7541,101 +7557,101 @@
         </add>
     </niobject>
 
-    <niobject name="NiKeyBasedEvaluator" abstract="true" inherit="NiEvaluator" since="V20_5_0_0" />
+    <niobject name="NiKeyBasedEvaluator" abstract="true" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0" />
 
-    <niobject name="NiBoolEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
+    <niobject name="NiBoolEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiBoolData" />
     </niobject>
 
-    <niobject name="NiBoolTimelineEvaluator" inherit="NiBoolEvaluator" since="V20_5_0_0" />
+    <niobject name="NiBoolTimelineEvaluator" inherit="NiBoolEvaluator" module="NiAnimation" since="V20_5_0_0" />
 
-    <niobject name="NiColorEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
+    <niobject name="NiColorEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiColorData" />
     </niobject>
 
-    <niobject name="NiFloatEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
+    <niobject name="NiFloatEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiFloatData" />
     </niobject>
 
-    <niobject name="NiPoint3Evaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
+    <niobject name="NiPoint3Evaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiPosData" />
     </niobject>
 
-    <niobject name="NiQuaternionEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
+    <niobject name="NiQuaternionEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Data" type="Ref" template="NiRotData" />
     </niobject>
 
-    <niobject name="NiTransformEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
+    <niobject name="NiTransformEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Value" type="NiQuatTransform" />
         <add name="Data" type="Ref" template="NiTransformData" />
     </niobject>
 
-    <niobject name="NiConstBoolEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
+    <niobject name="NiConstBoolEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Value" type="float" default="#INV_FLT#">For floating point as boolean, 0.0 indicates false and 1.0 indicates true.</add>
     </niobject>
 
-    <niobject name="NiConstColorEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
+    <niobject name="NiConstColorEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Value" type="Color4" default="#INV_VEC4#" />
     </niobject>
 
-    <niobject name="NiConstFloatEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
+    <niobject name="NiConstFloatEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Value" type="float" default="#INV_FLT#" />
     </niobject>
 
-    <niobject name="NiConstPoint3Evaluator" inherit="NiEvaluator" since="V20_5_0_0">
+    <niobject name="NiConstPoint3Evaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Value" type="Vector3" default="#INV_VEC3#" />
     </niobject>
 
-    <niobject name="NiConstQuaternionEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
+    <niobject name="NiConstQuaternionEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Value" type="Quaternion" default="#INV_VEC4#" />
     </niobject>
 
-    <niobject name="NiConstTransformEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
+    <niobject name="NiConstTransformEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Value" type="NiQuatTransform" />
     </niobject>
 
-    <niobject name="NiBSplineEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
+    <niobject name="NiBSplineEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Start Time" type="float" default="#FLT_MAX#" />
         <add name="End Time" type="float" default="#FLT_MIN#" />
         <add name="Data" type="Ref" template="NiBSplineData" />
         <add name="Basis Data" type="Ref" template="NiBSplineBasisData" />
     </niobject>
 
-    <niobject name="NiBSplineColorEvaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
+    <niobject name="NiBSplineColorEvaluator" inherit="NiBSplineEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompColorEvaluator" inherit="NiBSplineColorEvaluator" since="V20_5_0_0">
+    <niobject name="NiBSplineCompColorEvaluator" inherit="NiBSplineColorEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Offset" type="float" default="#FLT_MAX#" />
         <add name="Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
-    <niobject name="NiBSplineFloatEvaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
+    <niobject name="NiBSplineFloatEvaluator" inherit="NiBSplineEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompFloatEvaluator" inherit="NiBSplineFloatEvaluator" since="V20_5_0_0">
+    <niobject name="NiBSplineCompFloatEvaluator" inherit="NiBSplineFloatEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Offset" type="float" default="#FLT_MAX#" />
         <add name="Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
-    <niobject name="NiBSplinePoint3Evaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
+    <niobject name="NiBSplinePoint3Evaluator" inherit="NiBSplineEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompPoint3Evaluator" inherit="NiBSplinePoint3Evaluator" since="V20_5_0_0">
+    <niobject name="NiBSplineCompPoint3Evaluator" inherit="NiBSplinePoint3Evaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Offset" type="float" default="#FLT_MAX#" />
         <add name="Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
-    <niobject name="NiBSplineTransformEvaluator" inherit="NiBSplineEvaluator" since="V20_5_0_0">
+    <niobject name="NiBSplineTransformEvaluator" inherit="NiBSplineEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Transform" type="NiQuatTransform" />
         <add name="Translation Handle" type="uint" default="0xFFFF">Handle into the translation data. (USHRT_MAX for invalid handle.)</add>
         <add name="Rotation Handle" type="uint" default="0xFFFF">Handle into the rotation data. (USHRT_MAX for invalid handle.)</add>
         <add name="Scale Handle" type="uint" default="0xFFFF">Handle into the scale data. (USHRT_MAX for invalid handle.)</add>
     </niobject>
 
-    <niobject name="NiBSplineCompTransformEvaluator" inherit="NiBSplineTransformEvaluator" since="V20_5_0_0">
+    <niobject name="NiBSplineCompTransformEvaluator" inherit="NiBSplineTransformEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Translation Offset" type="float" default="#FLT_MAX#" />
         <add name="Translation Half Range" type="float" default="#FLT_MAX#" />
         <add name="Rotation Offset" type="float" default="#FLT_MAX#" />
@@ -7644,7 +7660,7 @@
         <add name="Scale Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
-    <niobject name="NiLookAtEvaluator" inherit="NiEvaluator" since="V20_5_0_0">
+    <niobject name="NiLookAtEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Flags" type="LookAtFlags" />
         <add name="Look At Name" type="string" />
         <add name="Driven Name" type="string" />
@@ -7653,7 +7669,7 @@
         <add name="Interpolator: Scale" type="Ref" template="NiFloatInterpolator" />
     </niobject>
 
-    <niobject name="NiPathEvaluator" inherit="NiKeyBasedEvaluator" since="V20_5_0_0">
+    <niobject name="NiPathEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Flags" type="PathFlags" default="3" />
         <add name="Bank Dir" type="int" default="1">-1 = Negative, 1 = Positive</add>
         <add name="Max Bank Angle" type="float">Max angle in radians.</add>
@@ -7663,7 +7679,7 @@
         <add name="Percent Data" type="Ref" template="NiFloatData" />
     </niobject>
 
-    <niobject name="NiSequenceData" inherit="NiObject" since="V20_5_0_0">
+    <niobject name="NiSequenceData" inherit="NiObject" module="NiAnimation" since="V20_5_0_0">
         Root node in Gamebryo .kf files (20.5.0.1 and up).
         For 20.5.0.0, "NiSequenceData" is an alias for "NiControllerSequence" and this is not handled in nifxml.
         This was not found in any 20.5.0.0 KFs available and they instead use NiControllerSequence directly.
@@ -7699,7 +7715,7 @@
         <option value="9" name="AUTO_DIR_LIGHT_FRUSTUM_POSITION" />
     </bitflags>
 
-    <niobject name="NiShadowGenerator" inherit="NiObject">
+    <niobject name="NiShadowGenerator" inherit="NiObject" module="NiMain">
         An NiShadowGenerator object is attached to an NiDynamicEffect object to inform the shadowing system that the effect produces shadows.
         <add name="Name" type="string" default="NiStandardShadowTechnique" />
         <add name="Flags" type="NiShadowGeneratorFlags" default="0x3DB" />
@@ -7715,7 +7731,7 @@
         <add name="Directional Light Frustum Width" type="float" ver1="20.3.0.7" />
     </niobject>
 
-    <niobject name="NiFurSpringController" inherit="NiTimeController" versions="V10_2_0_0__1">
+    <niobject name="NiFurSpringController" inherit="NiTimeController" module="NiCustom" versions="V10_2_0_0__1">
         Blood Bowl Specific
         Used on things like hair/tails in conjunction with bones to animate them.
         <add name="Unknown Float" type="float"></add>
@@ -7726,7 +7742,7 @@
         <add name="Bones 2" type="Ptr" template="NiNode" arr1="Num Bones 2">List of all armature bones.</add>
     </niobject>
 
-    <niobject name="CStreamableAssetData" inherit="NiObject" versions="V20_3_0_9 V20_3_0_9_DIV2">
+    <niobject name="CStreamableAssetData" inherit="NiObject" module="NiCustom" versions="V20_3_0_9 V20_3_0_9_DIV2">
         Divinity 2 specific block
         <add name="Root" type="Ref" template="NiNode" />
         <add name="Has Data" type="bool" />
@@ -7735,7 +7751,7 @@
         <add name="Refs" type="Ref" template="NiObject" arr1="Num Refs" />
     </niobject>
 
-    <niobject name="bhkCompressedMeshShape" inherit="bhkShape" versions="#SKY_AND_LATER#">
+    <niobject name="bhkCompressedMeshShape" inherit="bhkShape" module="BSHavok" versions="#SKY_AND_LATER#">
         Compressed collision mesh.
         <add name="Target" type="Ptr" template="NiAVObject">Points to root node?</add>
         <add name="User Data" type="uint" />
@@ -7763,7 +7779,7 @@
         <!--<option value="4" name="FOUR_BYTES_PER_TRIANGLE" />-->
     </enum>
 
-    <niobject name="bhkCompressedMeshShapeData" inherit="bhkRefObject" versions="#SKY_AND_LATER#">
+    <niobject name="bhkCompressedMeshShapeData" inherit="bhkRefObject" module="BSHavok" versions="#SKY_AND_LATER#">
          A compressed mesh shape for collision in Skyrim.
 		<add name="Bits Per Index" type="uint" default="17">Number of bits in the shape-key reserved for a triangle index</add>
 		<add name="Bits Per W Index" type="uint" default="18">Number of bits in the shape-key reserved for a triangle index and its winding</add>
@@ -7793,7 +7809,7 @@
         <add name="Num Convex Piece A" type="uint">Number of hkpCompressedMeshShape::ConvexPiece. Unused.</add>
 	</niobject>
 	
-    <niobject name="BSInvMarker" inherit="NiExtraData" versions="#SKY_AND_LATER#">
+    <niobject name="BSInvMarker" inherit="NiExtraData" module="BSMain" versions="#SKY_AND_LATER#">
     Orientation marker for Skyrim's inventory view.
         How to show the nif in the player's inventory.
         Typically attached to the root node of the nif tree.
@@ -7807,41 +7823,41 @@
         <add name="Zoom" type="float" default="1.0">Zoom factor.</add>
     </niobject>
 
-	<niobject name="BSBoneLODExtraData" inherit="NiExtraData" versions="#SKY_AND_LATER#">
+	<niobject name="BSBoneLODExtraData" inherit="NiExtraData" module="BSMain" versions="#SKY_AND_LATER#">
     Unknown
 		<add name="BoneLOD Count" type="uint" default="3">Number of bone entries</add>
         <add name="BoneLOD Info" type="BoneLOD" arr1="BoneLOD Count">Bone Entry</add>
 	</niobject>
 	
-	<niobject name="BSBehaviorGraphExtraData" inherit="NiExtraData" versions="#SKY_AND_LATER#">
+	<niobject name="BSBehaviorGraphExtraData" inherit="NiExtraData" module="BSMain" versions="#SKY_AND_LATER#">
     Links a nif with a Havok Behavior .hkx animation file
 		<add name="Behaviour Graph File" type="string">Name of the hkx file.</add>
 		<add name="Controls Base Skeleton" type="bool">Unknown, has to do with blending appended bones onto an actor.</add>
 	</niobject>
 
-	<niobject name="BSLagBoneController" inherit="NiTimeController" versions="#SKY_AND_LATER#">
+	<niobject name="BSLagBoneController" inherit="NiTimeController" module="BSAnimation" versions="#SKY_AND_LATER#">
     A controller that trails a bone behind an actor.
 		<add name="Linear Velocity" type="float" default="3.0">How long it takes to rotate about an actor back to rest position.</add>
 		<add name="Linear Rotation" type="float" default="1.0">How the bone lags rotation</add>
 		<add name="Maximum Distance" type="float" default="400.0">How far bone will tail an actor.</add>
 	</niobject>
 
-	<niobject name="BSLODTriShape" inherit="NiTriBasedGeom" versions="#SKY# #SSE#">
+	<niobject name="BSLODTriShape" inherit="NiTriBasedGeom" module="BSMain" versions="#SKY# #SSE#">
 		A variation on NiTriShape, for visibility control over vertex groups.
 		<add name="LOD0 Size" type="uint" />
 		<add name="LOD1 Size" type="uint" />
 		<add name="LOD2 Size" type="uint" />
 	</niobject>
 
-	<niobject name="BSFurnitureMarkerNode" inherit="BSFurnitureMarker" versions="#SKY_AND_LATER#">
+	<niobject name="BSFurnitureMarkerNode" inherit="BSFurnitureMarker" module="BSMain" versions="#SKY_AND_LATER#">
         Furniture Marker for actors
     </niobject>
 	
-    <niobject name="BSLeafAnimNode" inherit="NiNode" versions="#BETHESDA#">
+    <niobject name="BSLeafAnimNode" inherit="NiNode" module="BSMain" versions="#BETHESDA#">
         Unknown, related to trees.
     </niobject>
     
-    <niobject name="BSTreeNode" inherit="NiNode" versions="#BETHESDA#">
+    <niobject name="BSTreeNode" inherit="NiNode" module="BSMain" versions="#BETHESDA#">
         Node for handling Trees, Switches branch configurations for variation?
         <add name="Num Bones 1" type="uint" default="1" />
         <add name="Bones 1" type="Ref" arr1="Num Bones 1" template="NiNode" />
@@ -7852,7 +7868,7 @@
     
     <!-- Fallout 4 Geometry -->
     
-    <niobject name="BSTriShape" inherit="NiAVObject" versions="#SSE# #FO4#">
+    <niobject name="BSTriShape" inherit="NiAVObject" module="BSMain" versions="#SSE# #FO4#">
         Fallout 4 Tri Shape
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Skin" type="Ref" template="NiObject" />
@@ -7872,7 +7888,7 @@
         <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
     </niobject>
 
-    <niobject name="BSMeshLODTriShape" inherit="BSTriShape" versions="#FO4#">
+    <niobject name="BSMeshLODTriShape" inherit="BSTriShape" module="BSMain" versions="#FO4#">
         Fallout 4 LOD Tri Shape
         <add name="LOD0 Size" type="uint" />
         <add name="LOD1 Size" type="uint" />
@@ -7896,7 +7912,7 @@
         <add name="SSF File" type="byte" arr1="SSF Length" />
     </compound>
 
-    <niobject name="BSSubIndexTriShape" inherit="BSTriShape" versions="#SSE# #FO4#">
+    <niobject name="BSSubIndexTriShape" inherit="BSTriShape" module="BSMain" versions="#SSE# #FO4#">
         Fallout 4 Sub-Index Tri Shape
 		<add name="Num Primitives" type="uint" calc="#LEN[Triangles]#" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
 		<add name="Num Segments" type="uint" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
@@ -7909,11 +7925,11 @@
     
     <!-- Fallout 4 Physics -->
 
-    <niobject name="bhkSystem" abstract="true" inherit="NiObject" versions="#FO4#">
+    <niobject name="bhkSystem" abstract="true" inherit="NiObject" module="BSHavok" versions="#FO4#">
         Fallout 4 Physics System
     </niobject>
     
-    <niobject name="bhkNPCollisionObject" inherit="NiCollisionObject" versions="#FO4#">
+    <niobject name="bhkNPCollisionObject" inherit="NiCollisionObject" module="BSHavok" versions="#FO4#">
         Fallout 4 Collision Object
         <add name="Flags" type="ushort">
             Due to inaccurate reporting in the CK the Reset and Sync On Update positions are a guess.
@@ -7923,21 +7939,21 @@
         <add name="Body ID" type="uint" />
     </niobject>
     
-    <niobject name="bhkPhysicsSystem" inherit="bhkSystem" versions="#FO4#">
+    <niobject name="bhkPhysicsSystem" inherit="bhkSystem" module="BSHavok" versions="#FO4#">
         Fallout 4 Collision System
         <add name="Binary Data" type="ByteArray" />
     </niobject>
 
-    <niobject name="bhkRagdollSystem" inherit="bhkSystem" versions="#FO4#">
+    <niobject name="bhkRagdollSystem" inherit="bhkSystem" module="BSHavok" versions="#FO4#">
         Fallout 4 Ragdoll System
         <add name="Binary Data" type="ByteArray" />
     </niobject>
 
-    <niobject name="BSExtraData" inherit="NiExtraData" versions="#FO4#">
+    <niobject name="BSExtraData" inherit="NiExtraData" module="BSMain" versions="#FO4#">
         Fallout 4 Extra Data
     </niobject>
 
-    <niobject name="BSClothExtraData" inherit="BSExtraData" versions="#FO4#">
+    <niobject name="BSClothExtraData" inherit="BSExtraData" module="BSMain" versions="#FO4#">
         Fallout 4 Cloth data
         <add name="Binary Data" type="ByteArray" />
     </niobject>
@@ -7952,7 +7968,7 @@
         <add name="Scale" type="float" />
     </compound>
 
-    <niobject name="BSSkin::Instance" inherit="NiObject" versions="#FO4#">
+    <niobject name="BSSkin::Instance" inherit="NiObject" module="BSMain" versions="#FO4#">
         Fallout 4 Skin Instance
         <add name="Skeleton Root" type="Ptr" template="NiAVObject" />
         <add name="Data" type="Ref" template="BSSkin::BoneData" />
@@ -7962,13 +7978,13 @@
         <add name="Scales" type="Vector3" arr1="Num Scales" />
     </niobject>
 
-    <niobject name="BSSkin::BoneData" inherit="NiObject" versions="#FO4#">
+    <niobject name="BSSkin::BoneData" inherit="NiObject" module="BSMain" versions="#FO4#">
         Fallout 4 Bone Data
         <add name="Num Bones" type="uint" />
         <add name="Bone List" type="BSSkinBoneTrans" arr1="Num Bones" />
     </niobject>
 
-    <niobject name="BSPositionData" inherit="NiExtraData" versions="#FO4#">
+    <niobject name="BSPositionData" inherit="NiExtraData" module="BSMain" versions="#FO4#">
         Fallout 4 Positional Data
         <add name="Num Data" type="uint" />
         <add name="Data" type="hfloat" arr1="Num Data" />
@@ -7982,20 +7998,20 @@
         <add name="Scale" type="float" default="1.0" />
     </compound>
 
-    <niobject name="BSConnectPoint::Parents" inherit="NiExtraData" versions="#FO4#">
+    <niobject name="BSConnectPoint::Parents" inherit="NiExtraData" module="BSMain" versions="#FO4#">
         Fallout 4 Item Slot Parent
         <add name="Num Connect Points" type="uint" default="1" />
         <add name="Connect Points" type="BSConnectPoint" arr1="Num Connect Points" />
     </niobject>
 
-    <niobject name="BSConnectPoint::Children" inherit="NiExtraData" versions="#FO4#">
+    <niobject name="BSConnectPoint::Children" inherit="NiExtraData" module="BSMain" versions="#FO4#">
         Fallout 4 Item Slot Child
         <add name="Skinned" type="bool" />
         <add name="Num Points" type="uint" default="1" />
         <add name="Point Name" type="SizedString" arr1="Num Points" />
     </niobject>
     
-    <niobject name="BSEyeCenterExtraData" inherit="NiExtraData" versions="#FO4#">
+    <niobject name="BSEyeCenterExtraData" inherit="NiExtraData" module="BSMain" versions="#FO4#">
         Fallout 4 Eye Center Data
         <add name="Num Data" type="uint" />
         <add name="Data" type="float" arr1="Num Data" />
@@ -8043,7 +8059,7 @@
         <add name="Shape ID 2" type="uint" />
     </compound>
 
-    <niobject name="BSPackedCombinedGeomDataExtra" inherit="NiExtraData" versions="#FO4#">
+    <niobject name="BSPackedCombinedGeomDataExtra" inherit="NiExtraData" module="BSMain" versions="#FO4#">
         Fallout 4 Packed Combined Geometry Data.
         Geometry is baked into the file and given a list of transforms to position each copy.
         <add name="Vertex Desc" type="BSVertexDesc" />
@@ -8055,7 +8071,7 @@
         <add name="Object Data" type="BSPackedGeomData" arr1="Num Data" />
     </niobject>
 
-    <niobject name="BSPackedCombinedSharedGeomDataExtra" inherit="NiExtraData" versions="#FO4#">
+    <niobject name="BSPackedCombinedSharedGeomDataExtra" inherit="NiExtraData" module="BSMain" versions="#FO4#">
         Fallout 4 Packed Combined Shared Geometry Data.
         Geometry is NOT baked into the file. It is instead a reference to the shape via a Shape ID (currently undecoded)
         which loads the geometry via the STAT form for the NIF.
@@ -8071,18 +8087,18 @@
 
     <!-- Fallout 4 Animation -->
     
-    <niobject name="NiLightRadiusController" inherit="NiFloatInterpController" versions="#FO4#">
+    <niobject name="NiLightRadiusController" inherit="NiFloatInterpController" module="BSAnimation" versions="#FO4#">
     
     </niobject>
 	
 	<!-- Skyrim SE --> 
 
-	<niobject name="BSDynamicTriShape" inherit="BSTriShape" versions="#SSE#">
+	<niobject name="BSDynamicTriShape" inherit="BSTriShape" module="BSMain" versions="#SSE#">
 		<add name="Dynamic Data Size" type="uint" calc="Num Vertices #MUL# 16" />
 		<add name="Vertices" type="Vector4" arr1="Dynamic Data Size / 16" />
 	</niobject>
 	
-	<niobject name="BSDistantObjectLargeRefExtraData" inherit="NiExtraData" versions="#SSE#">
+	<niobject name="BSDistantObjectLargeRefExtraData" inherit="NiExtraData" module="BSMain" versions="#SSE#">
         Large ref flag.
 		<add name="Large Ref" type="bool" />
 	</niobject>

From 46370f81aedfec4590581d14f1b775502eb7212a Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 26 Jul 2018 00:01:21 -0400
Subject: [PATCH 70/86] Mark custom modules

For #72

So that first party modules can be singled out if needed.
---
 nif.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nif.xml b/nif.xml
index 09e3712..a2520f5 100644
--- a/nif.xml
+++ b/nif.xml
@@ -90,12 +90,12 @@
     <module name="NiPSParticle" priority="80" depends="NiMain NiMesh NiAnimation" />
     <module name="NiPhysX" priority="90" depends="NiMain NiMesh NiPSParticle" />
     <module name="NiLegacy" priority="99" depends="NiMain NiAnimation NiParticle" />
-    <module name="BSMain" priority="100" depends="NiMain" />
-    <module name="BSAnimation" priority="125" depends="NiMain BSMain NiAnimation" />
-    <module name="BSParticle" priority="150" depends="NiMain NiParticle" />
-    <module name="BSHavok" priority="190" depends="NiMain" />
-    <module name="BSLegacy" priority="199" depends="NiMain NiLegacy" />
-    <module name="NiCustom" priority="255" depends="NiMain NiParticle" />
+    <module name="BSMain" priority="100" depends="NiMain" custom="true" />
+    <module name="BSAnimation" priority="125" depends="NiMain BSMain NiAnimation" custom="true" />
+    <module name="BSParticle" priority="150" depends="NiMain NiParticle" custom="true" />
+    <module name="BSHavok" priority="190" depends="NiMain" custom="true" />
+    <module name="BSLegacy" priority="199" depends="NiMain NiLegacy" custom="true" />
+    <module name="NiCustom" priority="255" depends="NiMain NiParticle" custom="true" />
 
     <token name="verexpr" attrs="vercond">
         Commonly used version expressions.

From c8857746b44cdec5b4f3080aa2becc4473b6af90 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 27 Jul 2018 12:06:12 -0400
Subject: [PATCH 71/86] bhkNiCollisionObject cleanup

Improved class descriptions and fixed Flags values and defaults.
---
 nif.xml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/nif.xml b/nif.xml
index a2520f5..6ff7679 100644
--- a/nif.xml
+++ b/nif.xml
@@ -3237,20 +3237,24 @@
     </niobject>
 
     <bitflags name="bhkCOFlags" storage="ushort" prefix="BHKCO" versions="#BETHESDA#">
-        bhkNiCollisionObject flags. The flags 0x2, 0x100, and 0x200 are not seen in any NIF nor get/set by the engine.
+        bhkNiCollisionObject flags.
+        0x100 and 0x200 are only for bhkBlendCollisionObject
         <option value="0" name="ACTIVE" />
+        <option value="1" name="RESET_TRANS" />
         <option value="2" name="NOTIFY" />
         <option value="3" name="SET_LOCAL" />
         <option value="4" name="DBG_DISPLAY" />
         <option value="5" name="USE_VEL" />
         <option value="6" name="RESET" />
         <option value="7" name="SYNC_ON_UPDATE" />
+        <option value="8" name="BLEND_POS" />
+        <option value="9" name="ALWAYS_BLEND" />
         <option value="10" name="ANIM_TARGETED" />
         <option value="11" name="DISMEMBERED_LIMB" />
     </bitflags>
 
     <niobject name="bhkNiCollisionObject" abstract="true" inherit="NiCollisionObject" module="BSHavok">
-        Havok related collision object?
+        Abstract base class to merge NiCollisionObject with Bethesda Havok.
         <add name="Flags" type="bhkCOFlags" default="1">
             Set to 1 for most objects, and to 41 for animated objects (ANIM_STATIC). Bits: 0=Active 2=Notify 3=Set Local 6=Reset.
         </add>
@@ -3258,11 +3262,11 @@
     </niobject>
 
     <niobject name="bhkCollisionObject" inherit="bhkNiCollisionObject" module="BSHavok">
-        Havok related collision object?
+        Primary Bethesda Havok object.
     </niobject>
 
     <niobject name="bhkBlendCollisionObject" inherit="bhkCollisionObject" module="BSHavok">
-        Unknown.
+        Bethesda Havok object used in skeletons.
         <add name="Heir Gain" type="float" default="1.0" />
         <add name="Vel Gain" type="float" default="1.0" />
         <add name="Unknown Float 1" type="float" vercond="#BSVER# #LT# 9" />
@@ -3270,11 +3274,11 @@
     </niobject>
 
     <niobject name="bhkPCollisionObject" inherit="bhkNiCollisionObject" module="BSHavok">
-        Unknown.
+        Bethesda Havok object for phantoms such as bhkAabbPhantom.
     </niobject>
 
     <niobject name="bhkSPCollisionObject" inherit="bhkPCollisionObject" module="BSHavok">
-        Unknown.
+        Bethesda Havok object for shape phantoms such as bhkSimpleShapePhantom.
     </niobject>
 
     <niobject name="NiAVObject" abstract="true" inherit="NiObjectNET" module="NiMain">
@@ -7928,12 +7932,11 @@
     <niobject name="bhkSystem" abstract="true" inherit="NiObject" module="BSHavok" versions="#FO4#">
         Fallout 4 Physics System
     </niobject>
-    
+
     <niobject name="bhkNPCollisionObject" inherit="NiCollisionObject" module="BSHavok" versions="#FO4#">
         Fallout 4 Collision Object
-        <add name="Flags" type="ushort">
-            Due to inaccurate reporting in the CK the Reset and Sync On Update positions are a guess.
-            Bits: 0=Reset, 2=Notify, 3=SetLocal, 7=SyncOnUpdate, 10=AnimTargeted
+        <add name="Flags" type="bhkCOFlags" default="0x80">
+            Note: The CK Preview scenegraph reports these bits incorrectly.
         </add>
         <add name="Data" type="Ref" template="bhkSystem" />
         <add name="Body ID" type="uint" />

From 0f0790f5b1b9c522b079280473053af239fefe4d Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Wed, 1 Aug 2018 01:04:43 -0400
Subject: [PATCH 72/86] Default Values Pass 3, Subclass Defaults

For #76

Implement initial subclass defaults.  Had to add additional attribute to deal with versioning of defaults, like block versioning.

Added more defaults to normal fields.

Added default to Vertex Color array, also enforcing that members with `arr1` can have a `default`.
---
 nif.xml | 162 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 133 insertions(+), 29 deletions(-)

diff --git a/nif.xml b/nif.xml
index 6ff7679..2ac5012 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1173,13 +1173,13 @@
         <option value="3" name="PROPAGATE_NEVER">Propagation never occurs regardless of collision result.</option>
     </enum>
 
-    <enum name="CollisionMode" storage="uint">
+    <enum name="CollisionMode" prefix="CM" storage="uint">
         The collision mode controls the type of collision operation that is to take place for NiCollisionData.
-        <option value="0" name="CM_USE_OBB">Use Bounding Box</option>
-        <option value="1" name="CM_USE_TRI">Use Triangles</option>
-        <option value="2" name="CM_USE_ABV">Use Alternate Bounding Volumes</option>
-        <option value="3" name="CM_NOTEST">Indicates that no collision test should be made.</option>
-        <option value="4" name="CM_USE_NIBOUND">Use NiBound</option>
+        <option value="0" name="USE_OBB">Use Bounding Box</option>
+        <option value="1" name="USE_TRI">Use Triangles</option>
+        <option value="2" name="USE_ABV">Use Alternate Bounding Volumes</option>
+        <option value="3" name="NOTEST">Indicates that no collision test should be made.</option>
+        <option value="4" name="USE_NIBOUND">Use NiBound</option>
     </enum>
 
     <enum name="BoundVolumeType" storage="uint">
@@ -3230,8 +3230,8 @@
 
     <niobject name="NiCollisionData" inherit="NiCollisionObject" module="NiMain">
         Collision box.
-        <add name="Propagation Mode" type="PropagationMode" />
-        <add name="Collision Mode" type="CollisionMode" ver1="10.1.0.0" />
+        <add name="Propagation Mode" type="PropagationMode" default="PROPAGATE_ALWAYS" />
+        <add name="Collision Mode" type="CollisionMode" default="NOTEST" ver1="10.1.0.0" />
         <add name="Use ABV" type="byte">Use Alternate Bounding Volume.</add>
         <add name="Bounding Volume" type="BoundingVolume" cond="Use ABV == 1" />
     </niobject>
@@ -3256,7 +3256,16 @@
     <niobject name="bhkNiCollisionObject" abstract="true" inherit="NiCollisionObject" module="BSHavok">
         Abstract base class to merge NiCollisionObject with Bethesda Havok.
         <add name="Flags" type="bhkCOFlags" default="1">
-            Set to 1 for most objects, and to 41 for animated objects (ANIM_STATIC). Bits: 0=Active 2=Notify 3=Set Local 6=Reset.
+            OB-FO3: Add 0x28 (SET_LOCAL | USE_VEL) for ANIM_STATIC layer objects.
+            Post-FO3: Always add 0x80 (SYNC_ON_UPDATE).
+            <default type="bhkCollisionObject" value="0x81" />
+            <default type="bhkPCollisionObject" value="0x81" />
+            <default type="bhkSPCollisionObject" value="0x81" />
+            <default type="bhkBlendCollisionObject" value="0x89" />
+            <default type="bhkCollisionObject" value="0x1" versions="V20_2_0_7_FO3 V20_0_0_5_OBL" />
+            <default type="bhkPCollisionObject" value="0x1" versions="V20_2_0_7_FO3 V20_0_0_5_OBL" />
+            <default type="bhkSPCollisionObject" value="0x1" versions="V20_2_0_7_FO3 V20_0_0_5_OBL" />
+            <default type="bhkBlendCollisionObject" value="0x9" versions="V20_2_0_7_FO3 V20_0_0_5_OBL" />
         </add>
         <add name="Body" type="Ref" template="bhkWorldObject" />
     </niobject>
@@ -3283,8 +3292,48 @@
 
     <niobject name="NiAVObject" abstract="true" inherit="NiObjectNET" module="NiMain">
         Abstract audio-visual base class from which all of Gamebryo's scene graph objects inherit.
-        <add name="Flags" type="uint" default="524302" vercond="#BSVER# #GT# 26">Basic flags for AV objects. For Bethesda streams above 26 only.</add>
-        <add name="Flags" type="ushort" ver1="3.0" vercond="#BSVER# #LTE# 26">Basic flags for AV objects; commonly 0x000C or 0x000A.</add>
+        <add name="Flags" type="uint" default="0x8000E" vercond="#BSVER# #GT# 26">
+            Basic flags for AV objects. For Bethesda streams above 26 only.
+            ALL: FO4 lacks the 0x80000 flag always. Skyrim lacks it sometimes.
+            BSTreeNode: 0x8080E (pre-FO4), 0x400E (FO4)
+            BSLeafAnimNode: 0x808000E (pre-FO4), 0x500E (FO4)
+            BSDamageStage, BSBlastNode: 0x8000F (pre-FO4), 0x2000000F (FO4)
+            <default type="NiNode" value="0xE" />
+            <default type="NiNode" value="0x8000E" versions="V20_2_0_7_FO3" />
+            <default type="NiLight" value="0xE" />
+            <default type="NiLight" value="0x8000E" versions="V20_2_0_7_FO3" />
+            <default type="BSMultiBoundNode" value="0xE" />
+            <default type="BSMultiBoundNode" value="0x8080E" versions="V20_2_0_7_FO3" />
+            <default type="BSTriShape" value="0xE" />
+            <default type="BSTriShape" value="0x8000E" versions="V20_2_0_7_SSE" />
+            <default type="BSSubIndexTriShape" value="0xE" />
+            <default type="BSSegmentedTriShape" value="0xE" />
+            <default type="BSSegmentedTriShape" value="0x8000E" versions="V20_2_0_7_FO3" />
+            <default type="BSMeshLODTriShape" value="0x100E" />
+            <default type="BSFadeNode" value="0x8000E" />
+            <default type="NiParticleSystem" value="0x8000E" />
+            <default type="BSMasterParticleSystem" value="0x8000E" />
+            <default type="NiParticleSystem" value="0xE" versions="V20_2_0_7_FO4" />
+            <default type="BSMasterParticleSystem" value="0xE" versions="V20_2_0_7_FO4" />
+            <default type="BSStripParticleSystem" value="0x8000E" />
+            <default type="NiTriShape" value="0x8000E" />
+            <default type="NiTriStrips" value="0x8000E" />
+            <default type="BSLeafAnimNode" value="0x808000E" />
+            <default type="BSLeafAnimNode" value="0x500E" versions="V20_2_0_7_FO4" />
+            <default type="BSTreeNode" value="0x8080E" />
+            <default type="BSTreeNode" value="0x400E" versions="V20_2_0_7_FO4" />
+            <default type="BSDebrisNode" value="0x8000F" />
+            <default type="BSBlastNode" value="0x8000F" />
+            <default type="BSDamageStage" value="0x8000F" />
+            <default type="BSOrderedNode" value="0x8200E" />
+            <default type="BSOrderedNode" value="0x200E" versions="V20_2_0_7_FO4" />
+            <default type="BSOrderedNode" value="0x8000E" versions="V20_2_0_7_FO3" />
+            <default type="BSBlastNode" value="0x2000000F" versions="V20_2_0_7_FO4" />
+            <default type="BSDamageStage" value="0x2000000F" versions="V20_2_0_7_FO4" />
+            <default type="BSLODTriShape" value="0x800000E" versions="V20_2_0_7_SSE" />
+            <default type="BSLODTriShape" value="0x808000E" versions="V20_2_0_7_SKY" />
+        </add>
+        <add name="Flags" type="ushort" ver1="3.0" vercond="#BSVER# #LTE# 26">Basic flags for AV objects.</add>
         <add name="Translation" type="Vector3">The translation vector.</add>
         <add name="Rotation" type="Matrix33">The rotation part of the transformation matrix.</add>
         <add name="Scale" type="float" default="1.0">Scaling part (only uniform scaling is supported).</add>
@@ -3326,10 +3375,54 @@
         <add name="Unknown" type="byte" arr1="6" />
     </niobject>
 
+    <enum name="NiPSysModifierOrder" storage="uint">
+        The set order for each derived class of NiPSysModifier.
+        Note: For Skyrim, BSPSysStripUpdateModifier is 8000 and for FO3 it is 2500.
+        <option value="0" name="ORDER_KILLOLDPARTICLES" />
+        <option value="1" name="ORDER_BSLOD" />
+        <option value="1000" name="ORDER_EMITTER" />
+        <option value="2000" name="ORDER_SPAWN" />
+        <option value="2500" name="ORDER_FO3_BSSTRIPUPDATE" />
+        <option value="3000" name="ORDER_GENERAL" />
+        <option value="4000" name="ORDER_FORCE" />
+        <option value="5000" name="ORDER_COLLIDER" />
+        <option value="6000" name="ORDER_POS_UPDATE" />
+        <option value="6500" name="ORDER_POSTPOS_UPDATE" />
+        <option value="7000" name="ORDER_BOUND_UPDATE" />
+        <option value="8000" name="ORDER_SK_BSSTRIPUPDATE" />
+    </enum>
+
     <niobject name="NiPSysModifier" abstract="true" inherit="NiObject" module="NiParticle">
         Abstract base class for all particle system modifiers.
         <add name="Name" type="string">Used to locate the modifier.</add>
-        <add name="Order" type="uint">Modifier ID in the particle modifier chain (always a multiple of 1000)?</add>
+        <add name="Order" type="NiPSysModifierOrder" default="ORDER_GENERAL">
+            Modifier's priority in the particle modifier chain.
+            <default type="NiPSysAgeDeathModifier" value="ORDER_KILLOLDPARTICLES" />
+            <default type="NiPSysMeshEmitter" value="ORDER_EMITTER" />
+            <default type="NiPSysVolumeEmitter" value="ORDER_EMITTER" />
+            <default type="NiPSysSpawnModifier" value="ORDER_EMITTER" />
+            <default type="NiPSysColorModifier" value="ORDER_GENERAL" />
+            <default type="NiPSysGrowFadeModifier" value="ORDER_GENERAL" />
+            <default type="NiPSysRotationModifier" value="ORDER_GENERAL" />
+            <default type="NiPSysBombModifier" value="ORDER_FORCE" />
+            <default type="NiPSysDragModifier" value="ORDER_FORCE" />
+            <default type="NiPSysFieldModifier" value="ORDER_FORCE" />
+            <default type="NiPSysGravityModifier" value="ORDER_FORCE" />
+            <default type="NiPSysColliderManager" value="ORDER_COLLIDER" />
+            <default type="NiPSysPositionModifier" value="ORDER_POS_UPDATE" />
+            <default type="NiPSysMeshUpdateModifier" value="ORDER_POSTPOS_UPDATE" />
+            <default type="NiPSysBoundUpdateModifier" value="ORDER_BOUND_UPDATE" />
+            <default type="BSPSysInheritVelocityModifier" value="ORDER_EMITTER" />
+            <default type="BSPSysScaleModifier" value="ORDER_GENERAL" />
+            <default type="BSPSysSimpleColorModifier" value="ORDER_GENERAL" />
+            <default type="BSPSysSubTexModifier" value="ORDER_GENERAL" />
+            <default type="BSParentVelocityModifier" value="ORDER_GENERAL" />
+            <default type="BSWindModifier" value="ORDER_FORCE" />
+            <default type="BSPSysRecycleBoundModifier" value="ORDER_POSTPOS_UPDATE" />
+            <default type="BSPSysLODModifier" value="ORDER_BSLOD" />
+            <default type="BSPSysStripUpdateModifier" value="ORDER_FO3_BSSTRIPUPDATE" versions="V20_2_0_7_FO3" />
+            <default type="BSPSysStripUpdateModifier" value="ORDER_SK_BSSTRIPUPDATE" versions="V20_2_0_7_SKY V20_2_0_7_SSE" />
+        </add>
         <add name="Target" type="Ptr" template="NiParticleSystem">NiParticleSystem parent of this modifier.</add>
         <add name="Active" type="bool" default="1">Whether or not the modifier is active.</add>
     </niobject>
@@ -3342,7 +3435,7 @@
         <add name="Declination Variation" type="float">Declination randomness / First axis.</add>
         <add name="Planar Angle" type="float">Planar Angle / Second axis.</add>
         <add name="Planar Angle Variation" type="float">Planar Angle randomness / Second axis .</add>
-        <add name="Initial Color" type="Color4">Defines color of a birthed particle.</add>
+        <add name="Initial Color" type="Color4" default="#VEC4_ONE#">Defines color of a birthed particle.</add>
         <add name="Initial Radius" type="float" default="1.0">Size of a birthed particle.</add>
         <add name="Radius Variation" type="float" ver1="10.4.0.1">Particle Radius randomness.</add>
         <add name="Life Span" type="float">Duration until a particle dies.</add>
@@ -3660,7 +3753,7 @@
 
             Note 2: set to either 0 or 0xFFFFFFFF for NifTexture compatibility.
         </add>
-        <add name="Vertex Colors" type="Color4" arr1="Num Vertices" cond="Has Vertex Colors">The vertex colors.</add>
+        <add name="Vertex Colors" type="Color4" default="#VEC4_ONE#" arr1="Num Vertices" cond="Has Vertex Colors">The vertex colors.</add>
         <add name="Data Flags" type="NiGeometryDataFlags" ver2="4.2.2.0">The lower 6 bits of this field represent the number of UV texture sets. The rest is unused.</add>
         <add name="Has UV" type="bool" ver2="4.0.0.2">
             Do we have UV coordinates?
@@ -5056,9 +5149,9 @@
 
     <niobject name="NiTriStripsData" inherit="NiTriBasedGeomData" module="NiMain">
         Holds mesh data using strips of triangles.
-        <add name="Num Strips" type="ushort">Number of OpenGL triangle strips that are present.</add>
+        <add name="Num Strips" type="ushort" default="1" />
         <add name="Strip Lengths" type="ushort" arr1="Num Strips">The number of points in each triangle strip.</add>
-        <add name="Has Points" type="bool" ver1="10.0.1.3">Do we have strip point data?</add>
+        <add name="Has Points" type="bool" default="1" ver1="10.0.1.3">Do we have strip point data?</add>
         <add name="Points" type="ushort" arr1="Num Strips" arr2="Strip Lengths" ver2="10.0.1.2">The points in the Triangle strips.  Size is the sum of all entries in Strip Lengths.</add>
         <add name="Points" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="Has Points" ver1="10.0.1.3">The points in the Triangle strips. Size is the sum of all entries in Strip Lengths.</add>
     </niobject>
@@ -6560,25 +6653,25 @@
     <niobject name="bhkLiquidAction" inherit="bhkAction" module="BSHavok" versions="#FO3_AND_LATER#">
         Bethesda custom bhkUnaryAction. Does not hold a link to the body like other bhkUnaryActions however.
         <add name="Unused 01" type="byte" arr1="12" binary="true" />
-        <add name="Initial Stick Force" type="float" />
-        <add name="Stick Strength" type="float" />
-        <add name="Neighbor Distance" type="float" />
-        <add name="Neighbor Strength" type="float" />
+        <add name="Initial Stick Force" type="float" default="25.0" />
+        <add name="Stick Strength" type="float" default="100.0" />
+        <add name="Neighbor Distance" type="float" default="128.0" />
+        <add name="Neighbor Strength" type="float" default="500.0" />
     </niobject>
 
-    <enum name="BSCPCullingType" storage="uint" versions="#FO3_AND_LATER#">
+    <enum name="BSCPCullingType" storage="uint" prefix="BSCP" versions="#FO3_AND_LATER#">
         Culling modes for multi bound nodes.
-        <option value="0" name="BSCP_CULL_NORMAL">Normal</option>
-        <option value="1" name="BSCP_CULL_ALLPASS">All Pass</option>
-        <option value="2" name="BSCP_CULL_ALLFAIL">All Fail</option>
-        <option value="3" name="BSCP_CULL_IGNOREMULTIBOUNDS">Ignore Multi Bounds</option>
-        <option value="4" name="BSCP_CULL_FORCEMULTIBOUNDSNOUPDATE">Force Multi Bounds No Update</option>
+        <option value="0" name="CULL_NORMAL">Normal</option>
+        <option value="1" name="CULL_ALLPASS">All Pass</option>
+        <option value="2" name="CULL_ALLFAIL">All Fail</option>
+        <option value="3" name="CULL_IGNOREMULTIBOUNDS">Ignore Multi Bounds</option>
+        <option value="4" name="CULL_FORCEMULTIBOUNDSNOUPDATE">Force Multi Bounds No Update</option>
     </enum>
 
     <niobject name="BSMultiBoundNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific node.
         <add name="Multi Bound" type="Ref" template="BSMultiBound" />
-		<add name="Culling Mode" type="BSCPCullingType" vercond="#BS_GTE_SKY#" />
+		<add name="Culling Mode" type="BSCPCullingType" default="CULL_ALLPASS" vercond="#BS_GTE_SKY#" />
     </niobject>
 
     <niobject name="BSMultiBound" inherit="NiObject" module="BSMain" versions="#FO3_AND_LATER#">
@@ -6625,7 +6718,7 @@
 
     <niobject name="BSSegmentedTriShape" inherit="NiTriShape" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific AV object.
-        <add name="Num Segments" type="uint" >Number of segments in the square grid</add>
+        <add name="Num Segments" type="uint" default="16">Number of segments in the square grid</add>
         <add name="Segment" type="BSGeometrySegmentData" arr1="Num Segments">Configuration of each segment</add>
     </niobject>
 
@@ -7205,7 +7298,18 @@
     <niobject name="NiPSForce" abstract="true" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle forces.
         <add name="Name" type="string" />
-        <add name="Type" type="PSForceType" />
+        <add name="Type" type="PSForceType">
+            The force type is set by each derived class and cannot be changed.
+            <default type="NiPSBombForce" value="FORCE_BOMB" />
+            <default type="NiPSDragForce" value="FORCE_DRAG" />
+            <default type="NiPSAirFieldForce" value="FORCE_AIR_FIELD" />
+            <default type="NiPSDragFieldForce" value="FORCE_DRAG_FIELD" />
+            <default type="NiPSGravityFieldForce" value="FORCE_GRAVITY_FIELD" />
+            <default type="NiPSRadialFieldForce" value="FORCE_RADIAL_FIELD" />
+            <default type="NiPSTurbulenceFieldForce" value="FORCE_TURBULENCE_FIELD" />
+            <default type="NiPSVortexFieldForce" value="FORCE_VORTEX_FIELD" />
+            <default type="NiPSGravityForce" value="FORCE_GRAVITY" />
+        </add>
         <add name="Active" type="bool" />
     </niobject>
 

From 87783585ac5d6a21ffda8ff6834405c1f781ad60 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 3 Aug 2018 20:28:12 -0400
Subject: [PATCH 73/86] String type fixes

Specify SizedString vs NiFixedString where appropriate.  The compound type `string` is an extra level of indirection in many cases, where the block can never be used on versions less than 20.1.0.3 where the CString to NiFixedString transition happened.

NiFixedString is a basic type, so using it where possible is recommended over the `string` compound type.

`string` could NOT be changed when dealing with multiple rows with the same name but version exclusive, such as "Accum Root Name".

Changed ShortString to ExportString as it was already documented as being exclusive to the Bethesda stream header.

Added SizedString with ushort length type, for the SSF File path.
---
 nif.xml | 88 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/nif.xml b/nif.xml
index 2ac5012..29a26b6 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1542,6 +1542,12 @@
         <add name="Value" type="char" arr1="Length">The string itself.</add>
     </compound>
 
+    <compound name="SizedString16">
+        A string of given length, using a ushort to store string length.
+        <add name="Length" type="ushort">The string length.</add>
+        <add name="Value" type="char" arr1="Length">The string itself.</add>
+    </compound>
+
     <compound name="string">
         A string type.
         <add name="String" type="SizedString" ver2="20.0.0.5">The normal string.</add>
@@ -1760,8 +1766,8 @@
         <add name="Nodes" type="Ptr" template="NiNode" arr1="Num Nodes">The list of NiNode references.</add>
     </compound>
 
-    <compound name="ShortString">
-        Another string format, for short strings.  Specific to Bethesda-specific header tags.
+    <compound name="ExportString">
+        Specific to Bethesda-specific header export strings.
         <add name="Length" type="byte">The string length.</add>
         <add name="Value" type="char" arr1="Length">The string itself, null terminated (the null terminator is taken into account in the length byte).</add>
     </compound>
@@ -1795,7 +1801,7 @@
         For Controller ID, NiInterpController::GetCtlrID() virtual function returns a string formatted specifically for the derived type.
         For Interpolator ID, NiInterpController::GetInterpolatorID() virtual function returns a string formatted specifically for the derived type.
         The string formats are documented on the relevant niobject blocks.
-        <add name="Target Name" type="string" ver2="10.1.0.103">Name of a controllable object in another NIF file.</add>
+        <add name="Target Name" type="SizedString" ver2="10.1.0.103">Name of a controllable object in another NIF file.</add>
         <!-- NiControllerSequence::InterpArrayItem -->
         <add name="Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.106" />
         <add name="Controller" type="Ref" template="NiTimeController" ver2="20.5.0.0" />
@@ -1826,10 +1832,10 @@
     <compound name="BSStreamHeader" versions="#BETHESDA#">
     	Information about how the file was exported
         <add name="BS Version" type="ulittle32" />
-        <add name="Author" type="ShortString" />
-        <add name="Process Script" type="ShortString" />
-        <add name="Export Script" type="ShortString" />
-        <add name="Max Filepath" type="ShortString" cond="BS Version == 130" />
+        <add name="Author" type="ExportString" />
+        <add name="Process Script" type="ExportString" />
+        <add name="Export Script" type="ExportString" />
+        <add name="Max Filepath" type="ExportString" cond="BS Version == 130" />
     </compound>
 
     <!-- Don't use vercond in Header, it breaks niflib -->
@@ -2454,7 +2460,7 @@
     <compound name="BoneLOD" size="8" versions="#SKY_AND_LATER#">
         Stores Bone Level of Detail info in a BSBoneLODExtraData
         <add name="Distance" type="uint" />
-        <add name="Bone Name" type="string" />
+        <add name="Bone Name" type="NiFixedString" />
     </compound>
 
     <compound name="bhkMeshMaterial" size="8" versions="#SKY_AND_LATER#">
@@ -2542,7 +2548,7 @@
 
     <niobject name="Ni3dsAnimationNode" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown. Only found in 2.3 nifs.
-        <add name="Name" type="string">Name of this object.</add>
+        <add name="Name" type="SizedString">Name of this object.</add>
         <add name="Has Data" type="bool" />
         <add name="Unknown Floats 1" type="float" arr1="21" cond="Has Data" />
         <add name="Unknown Short" type="ushort" cond="Has Data" />
@@ -3203,9 +3209,9 @@
     <compound name="LegacyExtraData" until="V2_3">
         Extra Data for pre-3.0 versions
         <add name="Has Extra Data" type="bool" />
-        <add name="Extra Prop Name" cond="Has Extra Data" type="string" />
+        <add name="Extra Prop Name" cond="Has Extra Data" type="SizedString" />
         <add name="Extra Ref ID" cond="Has Extra Data" type="uint" />
-        <add name="Extra String" cond="Has Extra Data" type="string" />
+        <add name="Extra String" cond="Has Extra Data" type="SizedString" />
         <add name="Unknown Byte 1" type="byte" />
     </compound>
 
@@ -3692,7 +3698,7 @@
         <add name="Shader Name" type="string" cond="Has Shader" ver1="10.0.1.0" ver2="20.1.0.3">The shader name.</add>
         <add name="Shader Extra Data" type="int" cond="Has Shader" ver1="10.0.1.0" ver2="20.1.0.3">Extra data associated with the shader. A value of -1 means the shader is the default implementation.</add>
         <add name="Num Materials" type="uint" ver1="20.2.0.5" />
-        <add name="Material Name" type="string" arr1="Num Materials" ver1="20.2.0.5">The name of the material.</add>
+        <add name="Material Name" type="NiFixedString" arr1="Num Materials" ver1="20.2.0.5">The name of the material.</add>
         <add name="Material Extra Data" type="int" arr1="Num Materials" ver1="20.2.0.5">Extra data associated with the material. A value of -1 means the material is the default implementation.</add>
         <add name="Active Material" type="int" default="-1" ver1="20.2.0.5">The index of the currently active material.</add>
         <add name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" vercond="#USER# == 1">Cyanide extension (Blood Bowl).</add>
@@ -5503,7 +5509,7 @@
         <add name="Dests" type="Ref" template="NiPhysXDest" arr1="Num Dests" />
         <add name="Num Modified Meshes" type="uint" ver1="20.4.0.0" />
         <add name="Modified Meshes" type="Ref" template="NiMesh" arr1="Num Modified Meshes" ver1="20.4.0.0" />
-        <add name="Temp Name" type="string" ver1="30.1.0.2" ver2="30.2.0.2" />
+        <add name="Temp Name" type="NiFixedString" ver1="30.1.0.2" ver2="30.2.0.2" />
         <add name="Keep Meshes" type="bool" />
         <add name="Snapshot" type="Ref" template="NiPhysXPropDesc" />
     </niobject>
@@ -5525,7 +5531,7 @@
 
     <niobject name="NiPhysXActorDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxActor objects.
-        <add name="Actor Name" type="string" />
+        <add name="Actor Name" type="NiFixedString" />
         <add name="Num Poses" type="uint" />
         <add name="Poses" type="Matrix34" arr1="Num Poses" />
         <add name="Body Desc" type="Ref" template="NiPhysXBodyDesc" />
@@ -5630,7 +5636,7 @@
     <niobject name="NiPhysXJointDesc" abstract="true" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         A PhysX Joint abstract base class.
         <add name="Joint Type" type="NxJointType" />
-        <add name="Joint Name" type="string" />
+        <add name="Joint Name" type="NiFixedString" />
         <add name="Actors" type="NiPhysXJointActor" arr1="2" />
         <add name="Max Force" type="float" />
         <add name="Max Torque" type="float" />
@@ -5729,7 +5735,7 @@
         <add name="Density" type="float" default="1.0" />
         <add name="Mass" type="float" default="-1.0" />
         <add name="Skin Width" type="float" default="-1.0" />
-        <add name="Shape Name" type="string" />
+        <add name="Shape Name" type="NiFixedString" />
         <add name="Non Interacting Compartment Types" type="uint" ver1="20.4.0.0" />
         <add name="Collision Bits" type="uint" arr1="4" />
         <add name="Plane" type="NxPlane" cond="Shape Type == 0" />
@@ -5742,7 +5748,7 @@
     <niobject name="NiPhysXMeshDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         Holds mesh data for streaming.
         <add name="Is Convex" type="bool" ver2="20.3.0.4" />
-        <add name="Mesh Name" type="string" />
+        <add name="Mesh Name" type="NiFixedString" />
         <add name="Mesh Data" type="ByteArray" />
         <add name="Back Compat Vertex Map Size" type="ushort" ver1="20.3.0.5" ver2="30.2.0.2" />
         <add name="Back Compat Vertex Map" type="ushort" arr1="Back Compat Vertex Map Size" ver1="20.3.0.5" ver2="30.2.0.2" />
@@ -5837,7 +5843,7 @@
 
     <niobject name="NiPhysXClothDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxClothDesc objects.
-        <add name="Name" type="string" />
+        <add name="Name" type="NiFixedString" />
         <add name="Mesh" type="Ref" template="NiPhysXMeshDesc" />
         <add name="Pose" type="Matrix34" ver2="20.3.0.9" />
         <add name="Thickness" type="float" default="0.01" />
@@ -6376,7 +6382,7 @@
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set, can have override in an esm/esp</add>
         <add name="Emissive Color" type="Color3" default="#VEC3_ZERO#">Glow color and alpha</add>
         <add name="Emissive Multiple" type="float" default="1.0">Multiplied emissive colors</add>
-        <add name="Wet Material" type="string" vercond="#BS_FO4#" />
+        <add name="Wet Material" type="NiFixedString" vercond="#BS_FO4#" />
         <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T">How to handle texture borders.</add>
         <add name="Alpha" type="float" default="1.0">The material opacity (1=non-transparent).</add>
         <add name="Refraction Strength" type="float">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
@@ -6616,7 +6622,7 @@
 
     <compound name="BSTreadTransform" size="68" versions="#FO3_AND_LATER#">
         Bethesda-specific compound.
-        <add name="Name" type="string" />
+        <add name="Name" type="NiFixedString" />
         <add name="Transform 1" type="NiQuatTransform" />
         <add name="Transform 2" type="NiQuatTransform" />
     </compound>
@@ -6809,7 +6815,7 @@
         Defines different kill poses. The game selects the pose randomly and applies it to a skeleton immediately upon ragdolling.
         Poses can be previewed in GECK Object Window-Actor Data-Ragdoll and selecting Pose Matching tab.
         <add name="Num Bones" type="uint" />
-        <add name="Bones" type="string" arr1="Num Bones" />
+        <add name="Bones" type="NiFixedString" arr1="Num Bones" />
         <add name="Num Poses" type="uint" />
         <add name="Poses" type="BonePose" arr1="Num Poses" />
     </niobject>
@@ -6822,7 +6828,7 @@
 
     <niobject name="bhkRagdollTemplateData" inherit="NiObject" module="BSHavok" versions="#FO3_AND_LATER#">
         Data for bhkRagdollTemplate
-        <add name="Name" type="string" />
+        <add name="Name" type="NiFixedString" />
         <add name="Mass" type="float" default="9.0" />
         <add name="Restitution" type="float" default="0.8" />
         <add name="Friction" type="float" default="0.3" />
@@ -6946,7 +6952,7 @@
     </niobject>
 
     <compound name="SemanticData" size="8" since="V20_5_0_0">
-        <add name="Name" type="string">
+        <add name="Name" type="NiFixedString">
             Type of data (POSITION, POSITION_BP, INDEX, NORMAL, NORMAL_BP,
             TEXCOORD, BLENDINDICES, BLENDWEIGHT, BONE_PALETTE, COLOR, DISPLAYLIST,
             MORPH_POSITION, BINORMAL_BP, TANGENT_BP).
@@ -7062,7 +7068,7 @@
         <add name="Num Interpolators" type="uint" />
         <add name="Interpolators" type="Ref" template="NiInterpolator" arr1="Num Interpolators" />
         <add name="Num Targets" type="uint" />
-        <add name="Target Names" type="string" arr1="Num Targets" />
+        <add name="Target Names" type="NiFixedString" arr1="Num Targets" />
     </niobject>
 
     <compound name="ElementReference" size="12" since="V20_5_0_0">
@@ -7297,7 +7303,7 @@
 
     <niobject name="NiPSForce" abstract="true" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle forces.
-        <add name="Name" type="string" />
+        <add name="Name" type="NiFixedString" />
         <add name="Type" type="PSForceType">
             The force type is set by each derived class and cannot be changed.
             <default type="NiPSBombForce" value="FORCE_BOMB" />
@@ -7394,7 +7400,7 @@
 
     <niobject name="NiPSEmitter" abstract="true" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle emitters.
-        <add name="Name" type="string" />
+        <add name="Name" type="NiFixedString" />
         <add name="Speed" type="float" />
         <add name="Speed Var" type="float" />
         <add name="Speed Flip Ratio" type="float" ver1="20.6.1.0" />
@@ -7469,7 +7475,7 @@
 
     <niobject name="NiPSEmitterCtlr" abstract="true" inherit="NiSingleInterpController" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle emitter time controllers.
-        <add name="Emitter Name" type="string" />
+        <add name="Emitter Name" type="NiFixedString" />
     </niobject>
 
     <niobject name="NiPSEmitterFloatCtlr" abstract="true" inherit="NiPSEmitterCtlr" module="NiPSParticle" since="V20_5_0_0">
@@ -7483,7 +7489,7 @@
 
     <niobject name="NiPSForceCtlr" abstract="true" inherit="NiSingleInterpController" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle force time controllers.
-        <add name="Force Name" type="string" />
+        <add name="Force Name" type="NiFixedString" />
     </niobject>
 
     <niobject name="NiPSForceBoolCtlr" abstract="true" inherit="NiPSForceCtlr" module="NiPSParticle" since="V20_5_0_0">
@@ -7650,11 +7656,11 @@
     <!-- NiEvaluator -->
 
     <niobject name="NiEvaluator" abstract="true" inherit="NiObject" module="NiAnimation" since="V20_5_0_0">
-        <add name="Node Name" type="string">The name of the animated NiAVObject.</add>
-        <add name="Property Type" type="string">The RTTI type of the NiProperty the controller is attached to, if applicable.</add>
-        <add name="Controller Type" type="string">The RTTI type of the NiTimeController.</add>
-        <add name="Controller ID" type="string">An ID that can uniquely identify the controller among others of the same type on the same NiObjectNET.</add>
-        <add name="Interpolator ID" type="string">An ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</add>
+        <add name="Node Name" type="NiFixedString">The name of the animated NiAVObject.</add>
+        <add name="Property Type" type="NiFixedString">The RTTI type of the NiProperty the controller is attached to, if applicable.</add>
+        <add name="Controller Type" type="NiFixedString">The RTTI type of the NiTimeController.</add>
+        <add name="Controller ID" type="NiFixedString">An ID that can uniquely identify the controller among others of the same type on the same NiObjectNET.</add>
+        <add name="Interpolator ID" type="NiFixedString">An ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</add>
         <add name="Channel Types" type="byte" arr1="4">
             Channel Indices are BASE/POS = 0, ROT = 1, SCALE = 2, FLAG = 3
             Channel Types are:
@@ -7770,8 +7776,8 @@
 
     <niobject name="NiLookAtEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
         <add name="Flags" type="LookAtFlags" />
-        <add name="Look At Name" type="string" />
-        <add name="Driven Name" type="string" />
+        <add name="Look At Name" type="NiFixedString" />
+        <add name="Driven Name" type="NiFixedString" />
         <add name="Interpolator: Translation" type="Ref" template="NiPoint3Interpolator" />
         <add name="Interpolator: Roll" type="Ref" template="NiFloatInterpolator" />
         <add name="Interpolator: Scale" type="Ref" template="NiFloatInterpolator" />
@@ -7792,7 +7798,7 @@
         For 20.5.0.0, "NiSequenceData" is an alias for "NiControllerSequence" and this is not handled in nifxml.
         This was not found in any 20.5.0.0 KFs available and they instead use NiControllerSequence directly.
         After 20.5.0.1, Controlled Blocks are no longer used and instead the sequences uses NiEvaluator.
-        <add name="Name" type="string" />
+        <add name="Name" type="NiFixedString" />
         <add name="Num Controlled Blocks" type="uint" ver2="20.5.0.1" />
         <add name="Array Grow By" type="uint" ver2="20.5.0.1" />
         <add name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" ver2="20.5.0.1" />
@@ -7802,7 +7808,7 @@
         <add name="Duration" type="float" />
         <add name="Cycle Type" type="CycleType" />
         <add name="Frequency" type="float" default="1.0" />
-        <add name="Accum Root Name" type="string">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
+        <add name="Accum Root Name" type="NiFixedString">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
         <add name="Accum Flags" type="AccumFlags" default="ACCUM_X_FRONT" />
     </niobject>
 
@@ -7939,7 +7945,7 @@
 	
 	<niobject name="BSBehaviorGraphExtraData" inherit="NiExtraData" module="BSMain" versions="#SKY_AND_LATER#">
     Links a nif with a Havok Behavior .hkx animation file
-		<add name="Behaviour Graph File" type="string">Name of the hkx file.</add>
+		<add name="Behaviour Graph File" type="NiFixedString">Name of the hkx file.</add>
 		<add name="Controls Base Skeleton" type="bool">Unknown, has to do with blending appended bones onto an actor.</add>
 	</niobject>
 
@@ -8014,10 +8020,8 @@
         <add name="Num Segments" type="uint" />
         <add name="Total Segments" type="uint" />
         <add name="Segment Starts" type="uint" arr1="Num Segments" />
-        <add name="Per Segment Data" type="BSGeometryPerSegmentSharedData" arr1="Total Segments" />
-        <!-- TODO: Actual ShortString type (current "ShortString" is actually a byte) -->
-        <add name="SSF Length" type="ushort" />
-        <add name="SSF File" type="byte" arr1="SSF Length" />
+        <add name="Per Segment Data" type="BSGeometryPerSegmentSharedData" arr1="Total Segments" />>
+        <add name="SSF File" type="SizedString16" />
     </compound>
 
     <niobject name="BSSubIndexTriShape" inherit="BSTriShape" module="BSMain" versions="#SSE# #FO4#">

From b0aafaa3de8f500100a81d6da2dc96c7af27df3a Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sun, 12 Aug 2018 22:20:17 -0400
Subject: [PATCH 74/86] Type, Name, Comment fixes

BSGeometrySegmentData - Combined rows which did not be separated by version.  Adopted better naming from FO4.

AspectFlags type for NiParticlesData for BS.

Changed the unused W component of what should be a Vector4 for Vertex to 'Unused W' for all rows.  Should seriously consider making these all Vector4s for endian correctness.

Misc comment cleanup.
---
 nif.xml | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/nif.xml b/nif.xml
index 29a26b6..f127179 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1985,11 +1985,11 @@
 	<compound name="BSVertexData" versions="#SSE# #FO4#">
 		<add name="Vertex" type="Vector3" cond="(#ARG# #BITAND# 0x401) == 0x401" />
 		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x411) == 0x411" />
-		<add name="Unknown Int" type="uint" cond="(#ARG# #BITAND# 0x411) == 0x401" />
+		<add name="Unused W" type="uint" cond="(#ARG# #BITAND# 0x411) == 0x401" />
 
 		<add name="Vertex" type="HalfVector3" cond="(#ARG# #BITAND# 0x401) == 0x1" />
 		<add name="Bitangent X" type="hfloat" cond="(#ARG# #BITAND# 0x411) == 0x11" />
-		<add name="Unknown Short" type="ushort" cond="(#ARG# #BITAND# 0x411) == 0x1" />
+		<add name="Unused W" type="ushort" cond="(#ARG# #BITAND# 0x411) == 0x1" />
 
 		<add name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x2" />
 		<add name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x8" />
@@ -2005,7 +2005,7 @@
 	<compound name="BSVertexDataSSE" versions="#SSE# #FO4#">
 		<add name="Vertex" type="Vector3" cond="#ARG# #BITAND# 0x1" />
 		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x11) == 0x11" />
-		<add name="Unknown Int" type="int" cond="(#ARG# #BITAND# 0x11) == 0x1" />
+		<add name="Unused W" type="uint" cond="(#ARG# #BITAND# 0x11) == 0x1" />
 		<add name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x2" />
 		<add name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x8" />
 		<add name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x8" />
@@ -3480,7 +3480,7 @@
     <niobject name="NiGeomMorpherController" inherit="NiInterpController" module="NiAnimation">
         DEPRECATED (20.5), replaced by NiMorphMeshModifier.
         Time controller for geometry morphing.
-        <add name="Extra Flags" type="GeomMorpherFlags" ver1="10.0.1.2" />
+        <add name="Morpher Flags" type="GeomMorpherFlags" ver1="10.0.1.2" />
         <add name="Data" type="Ref" template="NiMorphData">Geometry morphing data index.</add>
         <add name="Always Update" type="byte" ver1="4.0.0.1" />
         <add name="Num Interpolators" type="uint" ver1="10.1.0.106" />
@@ -3827,7 +3827,7 @@
     <niobject name="NiAlphaProperty" inherit="NiProperty" module="NiMain">
         Transparency. Flags 0x00ED.
         <add name="Flags" type="AlphaFlags" default="4844" />
-        <add name="Threshold" type="byte" default="128">Threshold for alpha testing (see: glAlphaFunc)</add>
+        <add name="Threshold" type="byte" default="128">Threshold for alpha testing</add>
         <add name="Unknown Short 1" type="ushort" ver2="2.3" />
         <add name="Unknown Int 2" type="uint" ver2="2.3" />
     </niobject>
@@ -3836,6 +3836,12 @@
         Ambient light source.
     </niobject>
 
+    <bitflags name="AspectFlags" storage="ushort" versions="#FO3_AND_LATER#">
+        <option value="0" name="Velocity Orientation" />
+        <option value="1" name="Initial Rotation from Velocity" />
+        <option value="8" name="Speed to Aspect Enabled" />
+    </bitflags>
+
     <niobject name="NiParticlesData" inherit="NiGeometryData" module="NiMain">
         Generic rotating particles data object.
         Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly.
@@ -3858,7 +3864,7 @@
         <add name="Num Subtexture Offsets" type="byte" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BSSTREAM# #AND# #NI_BS_LTE_FO3#">2,4,8,16,32,64 are potential values. If "Has" was no then this should be 256, which represents a 16x16 framed image, which is invalid</add>
         <add name="Subtexture Offsets" type="Vector4" arr1="Num Subtexture Offsets" vercond="#BS202#">Defines UV offsets</add>
         <add name="Aspect Ratio" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#">Sets aspect ratio for Subtexture Offset UV quads</add>
-        <add name="Aspect Flags" type="ushort" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <add name="Aspect Flags" type="AspectFlags" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
         <add name="Speed to Aspect Aspect 2" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
         <add name="Speed to Aspect Speed 1" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
         <add name="Speed to Aspect Speed 2" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
@@ -5008,7 +5014,7 @@
         Allows control of stencil testing.
         <add name="Flags" type="ushort" ver2="10.0.1.2">Property flags.</add>
         <add name="Stencil Enabled" type="byte" ver2="20.0.0.5">Enables or disables the stencil test.</add>
-        <add name="Stencil Function" type="StencilTestFunc" ver2="20.0.0.5">Selects the compare mode function (see: glStencilFunc).</add>
+        <add name="Stencil Function" type="StencilTestFunc" ver2="20.0.0.5">Selects the compare mode function.</add>
         <add name="Stencil Ref" type="uint" ver2="20.0.0.5" />
         <add name="Stencil Mask" type="uint" default="#UINT_MAX#" ver2="20.0.0.5">A bit mask. The default is 0xffffffff.</add>
         <add name="Fail Action" type="StencilAction" ver2="20.0.0.5" />
@@ -5021,8 +5027,8 @@
     </niobject>
 
     <niobject name="NiStringExtraData" inherit="NiExtraData" module="NiMain">
-        Apparently commands for an optimizer instructing it to keep things it would normally discard.
-        Also refers to NiNode objects (through their name) in animation .kf files.
+        Extra data in the form of text.
+        Used in various official or user-defined ways, e.g. preventing optimization on objects ("NiOptimizeKeep", "sgoKeep").
         <add name="String Data" type="string" ver1="4.0.0.0">The string.</add>
     </niobject>
 
@@ -5032,13 +5038,13 @@
     </niobject>
 
     <niobject name="NiStringsExtraData" inherit="NiExtraData" module="NiMain">
-        List of strings; for example, a list of all bone names.
+        Extra data in the form of a list of strings.
         <add name="Num Strings" type="uint" default="1">Number of strings.</add>
         <add name="Data" type="SizedString" arr1="Num Strings">The strings.</add>
     </niobject>
 
     <niobject name="NiTextKeyExtraData" inherit="NiExtraData" module="NiMain">
-        Extra data, used to name different animation sequences.
+        Extra data that holds an array of NiTextKey objects for use in animation sequences.
         <add name="Num Text Keys" type="uint">The number of text keys that follow.</add>
         <add name="Text Keys" type="Key" arg="1" template="string" arr1="Num Text Keys">List of textual notes and at which time they take effect. Used for designating the start and stop of animations and the triggering of sounds.</add>
     </niobject>
@@ -5284,7 +5290,7 @@
         Allows applications to set the test and write modes of the renderer's Z-buffer and to set the comparison function used for the Z-buffer test.
         <add name="Flags" type="ZBufferFlags" default="3" />
         <add name="Function" type="TestFunction" default="TEST_LESS_EQUAL" ver1="4.1.0.12" ver2="20.0.0.5">
-            Z-Test function (see: glDepthFunc). In Flags from 20.1.0.3 on.
+            Z-Test function. In Flags from 20.1.0.3 on.
         </add>
     </niobject>
 
@@ -6713,10 +6719,8 @@
     <compound name="BSGeometrySegmentData" versions="#FO3_AND_LATER#">
         Bethesda-specific. Describes groups of triangles either segmented in a grid (for LOD) or by body part for skinned FO4 meshes.
         <add name="Flags" type="byte" vercond="#NI_BS_LT_FO4#" />
-        <add name="Index" type="uint" vercond="#NI_BS_LT_FO4#">Index = previous Index + previous Num Tris in Segment * 3</add>
-        <add name="Num Tris in Segment" type="uint" vercond="#NI_BS_LT_FO4#">The number of triangles belonging to this segment</add>
-        <add name="Start Index" type="uint" vercond="#BS_FO4#" />
-        <add name="Num Primitives" type="uint" vercond="#BS_FO4#" />
+        <add name="Start Index" type="uint">Index = previous Index + previous Num Tris in Segment * 3</add>
+        <add name="Num Primitives" type="uint">The number of triangles belonging to this segment</add>
         <add name="Parent Array Index" type="uint" vercond="#BS_FO4#" />
         <add name="Num Sub Segments" type="uint" vercond="#BS_FO4#" />
         <add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="#BS_FO4#" />

From aa057174637c077fa55d52e49d91bf1183a14e20 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sun, 12 Aug 2018 22:43:49 -0400
Subject: [PATCH 75/86] Ranges Pass 1

For #70 and #76

Added tokens for range attribute strings.

Did initial pass of ranges, many from Bethesda's official export scripts for FO4, which limit the values in the UI. Also have begun using data analysis to find implied min/max ranges (as well as sane defaults).
---
 nif.xml | 161 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 91 insertions(+), 70 deletions(-)

diff --git a/nif.xml b/nif.xml
index f127179..e0b9bbd 100644
--- a/nif.xml
+++ b/nif.xml
@@ -161,7 +161,28 @@
         <default token="#INV_VEC3#" string="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
         <default token="#INV_VEC4#" string="-3.402823466e+38, -3.402823466e+38, -3.402823466e+38, -3.402823466e+38" />
     </token>
-    
+
+    <token name="range" attrs="range">
+        Commonly used range values.
+        <range token="#F_POS#" string="0.0:" />
+        <range token="#F_NEG#" string=":-0.0" />
+        <range token="#F_PNZ#" string="0.000001:" />
+        <range token="#F_NNZ#" string=":-0.000001" />
+        <range token="#F_NRM#" string="-1.0:1.0" />
+        <range token="#F_DEG#" string="-360.0:360.0" />
+        <range token="#F0_1#" string="0.0:1.0" />
+        <range token="#F0_PI#" string="0.0:3.1415926" />
+        <range token="#F0_10#" string="0.0:10.0" />
+        <range token="#F0_100#" string="0.0:100.0" />
+        <range token="#F0_999#" string="0.0:999.0" />
+        <range token="#F0_1000#" string="0.0:1000.0" />
+        <range token="#F0_10000#" string="0.0:10000.0" />
+        <range token="#FPM_1#" string="-1.0:1.0" />
+        <range token="#FPM_PI#" string="-3.1415926:3.1415926" />
+        <range token="#FPM_10#" string="-10.0:10.0" />
+        <range token="#FPM_100#" string="-100.0:100.0" />
+    </token>
+
     <token name="global" attrs="vercond">
         Global Tokens.
         NOTE: These must be listed after the above tokens so that they replace last. For example, `verexpr` uses these tokens.
@@ -1787,7 +1808,7 @@
     <compound name="BoneVertData" size="6">
         NiSkinData::BoneVertData. A vertex and its weight.
         <add name="Index" type="ushort">The vertex index, in the mesh.</add>
-        <add name="Weight" type="float">The vertex weight - between 0.0 and 1.0</add>
+        <add name="Weight" type="float" range="#F0_1#">The vertex weight - between 0.0 and 1.0</add>
     </compound>
 
     <compound name="AVObject">
@@ -1899,14 +1920,14 @@
 
     <compound name="TexCoord" size="8">
         Texture coordinates (u,v). As in OpenGL; image origin is in the lower left corner.
-        <add name="u" type="float">First coordinate.</add>
-        <add name="v" type="float">Second coordinate.</add>
+        <add name="u" type="float" range="#FPM_100#">First coordinate.</add>
+        <add name="v" type="float" range="#FPM_100#">Second coordinate.</add>
     </compound>
     
     <compound name="HalfTexCoord" size="4">
         Texture coordinates (u,v).
-        <add name="u" type="hfloat">First coordinate.</add>
-        <add name="v" type="hfloat">Second coordinate.</add>
+        <add name="u" type="hfloat" range="#FPM_10#">First coordinate.</add>
+        <add name="v" type="hfloat" range="#FPM_10#">Second coordinate.</add>
     </compound>
     
     <enum name="TransformMethod" storage="uint" prefix="TM">
@@ -2990,7 +3011,7 @@
             Example: 10 spheres colliding with 10 spheres will result in 100 collision checks.
             Therefore shapes like bhkCapsuleShape or bhkConvexVerticesShape should be preferred.
         <add name="Shape Property" type="bhkWorldObjCInfoProperty" />
-        <add name="Num Spheres" type="uint" calc="(#LEN[Spheres]# #LT# 8) #THEN# #LEN[Spheres]# #ELSE# 8" />
+        <add name="Num Spheres" type="uint" default="2" range="1:8" />
         <add name="Spheres" type="NiBound" arr1="Num Spheres">The spheres which make up the multi sphere shape. Max of 8.</add>
     </niobject>
 
@@ -3028,7 +3049,7 @@
 
         Shapes collected in a bhkListShape may not have the correct collision sound/FX due to HavokMaterial issues.
         Do not put a bhkPackedNiTriStripsShape in the Sub Shapes. Use a separate collision nodes without a list shape for those.
-        <add name="Num Sub Shapes" type="uint" default="1" calc="(#LEN[Sub Shapes]# #LT# 256) #THEN# #LEN[Sub Shapes]# #ELSE# 256" />
+        <add name="Num Sub Shapes" type="uint" default="1" range="1:256" />
         <add name="Sub Shapes" type="Ref" template="bhkShape" arr1="Num Sub Shapes">List of shapes. Max of 256.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Child Shape Property" type="bhkWorldObjCInfoProperty" />
@@ -4861,12 +4882,12 @@
     <niobject name="NiPSysAirFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, updates the particle velocity to simulate the effects of air movements like wind, fans, or wake.
         <add name="Direction" type="Vector3" default="#NEG_X_AXIS#">Direction of the particle velocity</add>
-        <add name="Air Friction" type="float">How quickly particles will accelerate to the magnitude of the air field.</add>
-        <add name="Inherit Velocity" type="float">How much of the air field velocity will be added to the particle velocity.</add>
+        <add name="Air Friction" type="float" range="#F0_1#">How quickly particles will accelerate to the magnitude of the air field.</add>
+        <add name="Inherit Velocity" type="float" range="#F0_1#">How much of the air field velocity will be added to the particle velocity.</add>
         <add name="Inherit Rotation" type="bool" />
         <add name="Component Only" type="bool" />
         <add name="Enable Spread" type="bool" />
-        <add name="Spread" type="float">The angle of the air field cone if Enable Spread is true.</add>
+        <add name="Spread" type="float" range="#F0_1#">The angle of the air field cone if Enable Spread is true.</add>
     </niobject>
     
     <niobject name="NiPSysTrailEmitter" inherit="NiPSysEmitter" module="NiCustom">
@@ -5005,9 +5026,9 @@
 
     <niobject name="NiSpotLight" inherit="NiPointLight" module="NiMain">
         A spot.
-        <add name="Outer Spot Angle" type="float" />
-        <add name="Inner Spot Angle" type="float" ver1="20.2.0.5" />
-        <add name="Exponent" type="float" default="1.0">Describes the distribution of light. (see: glLight)</add>
+        <add name="Outer Spot Angle" type="float" range="#F_DEG#" />
+        <add name="Inner Spot Angle" type="float" range="#F_DEG#" ver1="20.2.0.5" />
+        <add name="Exponent" type="float" default="1.0">Describes the distribution of light.</add>
     </niobject>
 
     <niobject name="NiStencilProperty" inherit="NiProperty" module="NiMain">
@@ -5147,7 +5168,7 @@
 
     <niobject name="NiTriShapeData" inherit="NiTriBasedGeomData" module="NiMain">
         Holds mesh data using a list of singular triangles.
-        <add name="Num Triangle Points" type="uint">Num Triangles times 3.</add>
+        <add name="Num Triangle Points" type="uint" range="0:196605">Num Triangles times 3.</add>
         <add name="Has Triangles" type="bool" ver1="10.1.0.0">Do we have triangle data?</add>
         <add name="Triangles" type="Triangle" arr1="Num Triangles" ver2="10.0.1.2">Triangle data.</add>
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Has Triangles" ver1="10.0.1.3">Triangle face data.</add>
@@ -6087,7 +6108,7 @@
         <add name="Shader Type" type="BSShaderType" default="SHADER_DEFAULT" vercond="#NI_BS_LTE_FO3#" />
         <add name="Shader Flags" type="BSShaderFlags" default="0x82000000" vercond="#NI_BS_LTE_FO3#" />
         <add name="Shader Flags 2" type="BSShaderFlags2" default="1" vercond="#NI_BS_LTE_FO3#" />
-        <add name="Environment Map Scale" type="float" default="1.0" vercond="#NI_BS_LTE_FO3#">Scales the intensity of the environment/cube map.</add>
+        <add name="Environment Map Scale" type="float" default="1.0" range="#F0_10#" vercond="#NI_BS_LTE_FO3#">Scales the intensity of the environment/cube map.</add>
     </niobject>
 
     <niobject name="BSShaderLightingProperty" abstract="true" inherit="BSShaderProperty" module="BSMain" versions="#FO3#">
@@ -6098,19 +6119,19 @@
     <niobject name="BSShaderNoLightingProperty" inherit="BSShaderLightingProperty" module="BSMain" versions="#FO3#">
         Bethesda-specific property.
         <add name="File Name" type="SizedString">The texture glow map.</add>
-        <add name="Falloff Start Angle" type="float" default="1.0" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
-        <add name="Falloff Stop Angle" type="float" default="0.0" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
-        <add name="Falloff Start Opacity" type="float" default="1.0" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at start angle</add>
-        <add name="Falloff Stop Opacity" type="float" default="0.0" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at end angle</add>
+        <add name="Falloff Start Angle" type="float" default="1.0" range="#F_NRM#" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
+        <add name="Falloff Stop Angle" type="float" default="0.0" range="#F_NRM#" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
+        <add name="Falloff Start Opacity" type="float" default="1.0" range="#F0_1#" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at start angle</add>
+        <add name="Falloff Stop Opacity" type="float" default="0.0" range="#F0_1#" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at end angle</add>
     </niobject>
 
     <niobject name="BSShaderPPLightingProperty" inherit="BSShaderLightingProperty" module="BSMain" versions="#FO3#">
         Bethesda-specific property.
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set</add>
-        <add name="Refraction Strength" type="float" default="0.0" vercond="#BSVER# #GT# 14">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
-        <add name="Refraction Fire Period" type="int" default="0" vercond="#BSVER# #GT# 14">Rate of texture movement for refraction shader.</add>
-        <add name="Parallax Max Passes" type="float" default="4.0" vercond="#BSVER# #GT# 24">The number of passes the parallax shader can apply.</add>
-        <add name="Parallax Scale" type="float" default="1.0" vercond="#BSVER# #GT# 24">The strength of the parallax.</add>
+        <add name="Refraction Strength" type="float" default="0.0" range="#F0_1#" vercond="#BSVER# #GT# 14">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
+        <add name="Refraction Fire Period" type="int" default="0" range="#FPM_1000#" vercond="#BSVER# #GT# 14">Rate of texture movement for refraction shader.</add>
+        <add name="Parallax Max Passes" type="float" default="4.0" range="1.0:320.0" vercond="#BSVER# #GT# 24">The number of passes the parallax shader can apply.</add>
+        <add name="Parallax Scale" type="float" default="1.0" range="#F0_10#" vercond="#BSVER# #GT# 24">The strength of the parallax.</add>
         <!-- TODO: Find where this could have even come from as > 34 doesn't exist for this block. -->
         <add name="Emissive Color" type="Color4" vercond="#BS_GT_FO3#">Glow color and alpha</add>
     </niobject>
@@ -6155,14 +6176,14 @@
         <add name="Interpolator 7: Length Var" type="Ref" template="NiInterpolator">References length variation interpolator.</add>
         <add name="Interpolator 8: Width" type="Ref" template="NiInterpolator">References width interpolator.</add>
         <add name="Interpolator 9: Arc Offset" type="Ref" template="NiInterpolator">References interpolator for amplitude control. 0=straight, 50=wide</add>
-        <add name="Subdivisions" type="ushort" default="6" />
-        <add name="Num Branches" type="ushort" default="1" />
-        <add name="Num Branches Variation" type="ushort" default="1" />
-        <add name="Length" type="float" default="512.0">How far lightning will stretch to.</add>
-        <add name="Length Variation" type="float" default="30.0">How far lightning variation will stretch to.</add>
-        <add name="Width" type="float" default="16.0">How wide the bolt will be.</add>
-        <add name="Child Width Mult" type="float" default="0.75">Influences forking behavior with a multiplier.</add>
-        <add name="Arc Offset" type="float" default="20.0" />
+        <add name="Subdivisions" type="ushort" default="6" range="0:12" />
+        <add name="Num Branches" type="ushort" default="1" range="0:10" />
+        <add name="Num Branches Variation" type="ushort" default="1" range="0:10" />
+        <add name="Length" type="float" default="512.0" range="#F0_10000#">How far lightning will stretch to.</add>
+        <add name="Length Variation" type="float" default="30.0" range="#F0_10000#">How far lightning variation will stretch to.</add>
+        <add name="Width" type="float" default="16.0" range="#F0_100#">How wide the bolt will be.</add>
+        <add name="Child Width Mult" type="float" default="0.75" range="#F0_10#">Influences forking behavior with a multiplier.</add>
+        <add name="Arc Offset" type="float" default="20.0" range="#F0_1000#" />
         <add name="Fade Main Bolt" type="bool" default="1" />
         <add name="Fade Child Bolts" type="bool" default="1" />
         <add name="Animate Arc Offset" type="bool" default="1" />
@@ -6387,42 +6408,42 @@
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set, can have override in an esm/esp</add>
         <add name="Emissive Color" type="Color3" default="#VEC3_ZERO#">Glow color and alpha</add>
-        <add name="Emissive Multiple" type="float" default="1.0">Multiplied emissive colors</add>
+        <add name="Emissive Multiple" type="float" default="1.0" range="#F0_10#">Multiplied emissive colors</add>
         <add name="Wet Material" type="NiFixedString" vercond="#BS_FO4#" />
         <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T">How to handle texture borders.</add>
-        <add name="Alpha" type="float" default="1.0">The material opacity (1=non-transparent).</add>
-        <add name="Refraction Strength" type="float">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
-        <add name="Glossiness" type="float" default="80" vercond="#NI_BS_LT_FO4#">The material specular power, or glossiness (0-999).</add>
-        <add name="Smoothness" type="float" default="1.0" vercond="#BS_FO4#">The base roughness (0.0-1.0), multiplied by the smoothness map.</add>
+        <add name="Alpha" type="float" default="1.0" range="0.0:128.0">The material opacity (1=opaque). Greater than 1.0 is used to affect alpha falloff i.e. staying opaque longer based on vertex alpha and alpha mask.</add>
+        <add name="Refraction Strength" type="float" range="#F0_1#">The amount of distortion. **Not based on physically accurate refractive index** (0=none)</add>
+        <add name="Glossiness" type="float" default="80" range="#F0_999#" vercond="#NI_BS_LT_FO4#">The material specular power, or glossiness.</add>
+        <add name="Smoothness" type="float" default="1.0" range="#F0_1#" vercond="#BS_FO4#">The base roughness, multiplied by the smoothness map.</add>
         <add name="Specular Color" type="Color3" default="#VEC3_ONE#">Adds a colored highlight.</add>
-        <add name="Specular Strength" type="float" default="1.0">Brightness of specular highlight. (0=not visible) (0-999)</add>
-        <add name="Lighting Effect 1" type="float" default="0.3" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
-        <add name="Lighting Effect 2" type="float" default="2.0" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
-        <add name="Subsurface Rolloff" type="float" default="0.0" vercond="#BS_FO4#" />
+        <add name="Specular Strength" type="float" default="1.0" range="#F0_10#">Brightness of specular highlight. (0=not visible)</add>
+        <add name="Lighting Effect 1" type="float" default="0.3" range="#F0_10#" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
+        <add name="Lighting Effect 2" type="float" default="2.0" range="#F0_1000#" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
+        <add name="Subsurface Rolloff" type="float" default="0.0" range="#F0_10#" vercond="#BS_FO4#" />
         <add name="Rimlight Power" type="float" default="#FLT_MAX#" vercond="#BS_FO4#" />
-        <add name="Backlight Power" type="float" cond="Rimlight Power == 0x7F7FFFFF" vercond="#BS_FO4#" />
-        <add name="Grayscale to Palette Scale" type="float" default="1.0" vercond="#BS_FO4#" />
-        <add name="Fresnel Power" type="float" default="5.0" vercond="#BS_FO4#" />
+        <add name="Backlight Power" type="float" range="#F0_1000#" cond="Rimlight Power == 0x7F7FFFFF" vercond="#BS_FO4#" />
+        <add name="Grayscale to Palette Scale" type="float" default="1.0" range="#F0_1#" vercond="#BS_FO4#" />
+        <add name="Fresnel Power" type="float" default="5.0" range="#F_PNZ#" vercond="#BS_FO4#" />
         <add name="Wetness Spec Scale" type="float" default="-1.0" vercond="#BS_FO4#" />
         <add name="Wetness Spec Power" type="float" default="-1.0" vercond="#BS_FO4#" />
         <add name="Wetness Min Var" type="float" default="-1.0" vercond="#BS_FO4#" />
         <add name="Wetness Env Map Scale" type="float" default="-1.0" vercond="#BS_FO4#" />
         <add name="Wetness Fresnel Power" type="float" default="-1.0" vercond="#BS_FO4#" />
         <add name="Wetness Metalness" type="float" default="-1.0" vercond="#BS_FO4#" />
-        <add name="Environment Map Scale" type="float" default="1.0" cond="Skyrim Shader Type == 1">Scales the intensity of the environment/cube map. (0-1)</add>
+        <add name="Environment Map Scale" type="float" default="1.0" range="#F0_10#" cond="Skyrim Shader Type == 1">Scales the intensity of the environment/cube map.</add>
         <add name="Use Screen Space Reflections" type="bool" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
         <add name="Wetness Control: Use SSR" type="bool" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
         <add name="Skin Tint Color" type="Color3" default="#VEC3_ONE#" cond="Skyrim Shader Type == 5">Tints the base texture. Overridden by game settings.</add>
         <add name="Skin Tint Alpha" type="float" default="1.0" cond="Skyrim Shader Type == 5" vercond="#BS_FO4#" />
         <add name="Hair Tint Color" type="Color3" default="#VEC3_ONE#" cond="Skyrim Shader Type == 6">Tints the base texture. Overridden by game settings.</add>
-        <add name="Max Passes" type="float" cond="Skyrim Shader Type == 7">Max Passes</add>
-        <add name="Scale" type="float" cond="Skyrim Shader Type == 7">Scale</add>
-        <add name="Parallax Inner Layer Thickness" type="float" default="5.0" cond="Skyrim Shader Type == 11">How far from the surface the inner layer appears to be.</add>
-        <add name="Parallax Refraction Scale" type="float" default="0.25" cond="Skyrim Shader Type == 11">Depth of inner parallax layer effect.</add>
+        <add name="Max Passes" type="float" default="4.0" range="1.0:320.0" cond="Skyrim Shader Type == 7" />
+        <add name="Scale" type="float" default="1.0" range="#F0_10#" cond="Skyrim Shader Type == 7" />
+        <add name="Parallax Inner Layer Thickness" type="float" default="5.0" range="5.0:500.0" cond="Skyrim Shader Type == 11">How far from the surface the inner layer appears to be.</add>
+        <add name="Parallax Refraction Scale" type="float" default="0.25" range="#F0_1#" cond="Skyrim Shader Type == 11">Depth of inner parallax layer effect.</add>
         <add name="Parallax Inner Layer Texture Scale" type="TexCoord" cond="Skyrim Shader Type == 11">Scales the inner parallax layer texture.</add>
-        <add name="Parallax Envmap Strength" type="float" default="1.0" cond="Skyrim Shader Type == 11">How strong the environment/cube map is. (0-??)</add>
+        <add name="Parallax Envmap Strength" type="float" default="1.0" range="#F0_10#" cond="Skyrim Shader Type == 11">How strong the environment/cube map is.</add>
         <add name="Sparkle Parameters" type="Vector4" cond="Skyrim Shader Type == 14">CK lists "snow material" when used.</add>
-        <add name="Eye Cubemap Scale" type="float" default="1.3" cond="Skyrim Shader Type == 16">Eye cubemap scale</add>
+        <add name="Eye Cubemap Scale" type="float" default="1.3" range="#F0_10#" cond="Skyrim Shader Type == 16">Eye cubemap scale</add>
         <add name="Left Eye Reflection Center" type="Vector3" cond="Skyrim Shader Type == 16">Offset to set center for left eye cubemap</add>
         <add name="Right Eye Reflection Center" type="Vector3" cond="Skyrim Shader Type == 16">Offset to set center for right eye cubemap</add>
     </niobject>
@@ -6439,20 +6460,20 @@
         <!-- TODO: Next 4 bytes requires bitfield, read as single int -->
         <add name="Texture Clamp Mode" type="byte" default="3">How to handle texture borders.</add>
         <add name="Lighting Influence" type="byte" default="255" />
-        <add name="Env Map Min LOD" type="byte" />
+        <add name="Env Map Min LOD" type="byte" range="0:16" />
         <add name="Unused Byte" type="byte" />
-        <add name="Falloff Start Angle" type="float" default="1.0">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
-        <add name="Falloff Stop Angle" type="float" default="1.0">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
-        <add name="Falloff Start Opacity" type="float">Alpha falloff multiplier at start angle</add>
-        <add name="Falloff Stop Opacity" type="float">Alpha falloff multiplier at end angle</add>
+        <add name="Falloff Start Angle" type="float" default="1.0" range="#F_NRM#">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
+        <add name="Falloff Stop Angle" type="float" default="1.0" range="#F_NRM#">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
+        <add name="Falloff Start Opacity" type="float" range="#F0_1#">Alpha falloff multiplier at start angle</add>
+        <add name="Falloff Stop Opacity" type="float" range="#F0_1#">Alpha falloff multiplier at end angle</add>
         <add name="Emissive Color" type="Color4" default="#VEC4_ONE#">Emissive color</add>
-        <add name="Emissive Multiple" type="float" default="1.0">Multiplier for Emissive Color (RGB part)</add>
-        <add name="Soft Falloff Depth" type="float" default="100.0" />
+        <add name="Emissive Multiple" type="float" default="1.0" range="0.0:360.0">Multiplier for Emissive Color (RGB part)</add>
+        <add name="Soft Falloff Depth" type="float" default="100.0" range="0.0:9999.0" />
         <add name="Greyscale Texture"  type="SizedString">Points to an external texture, used as palette for SLSF1_Greyscale_To_PaletteColor/SLSF1_Greyscale_To_PaletteAlpha.</add>
         <add name="Env Map Texture" type="SizedString" vercond="#BS_FO4#" />
         <add name="Normal Texture" type="SizedString" vercond="#BS_FO4#" />
         <add name="Env Mask Texture" type="SizedString" vercond="#BS_FO4#" />
-        <add name="Environment Map Scale" type="float" default="1.0" vercond="#BS_FO4#" />
+        <add name="Environment Map Scale" type="float" default="1.0" range="0.01:20.0" vercond="#BS_FO4#" />
     </niobject>
     
     <bitflags name="WaterShaderPropertyFlags" storage="uint" prefix="BSWSP" versions="#SKY_AND_LATER#">
@@ -6506,12 +6527,12 @@
 
     <niobject name="BSPSysSimpleColorModifier" inherit="NiPSysModifier" module="BSParticle" versions="#FO3_AND_LATER#">
         Bethesda-specific particle modifier.
-        <add name="Fade In Percent" type="float" default="0.1" />
-        <add name="Fade out Percent" type="float" default="0.9" />
-        <add name="Color 1 End Percent" type="float" />
-        <add name="Color 1 Start Percent" type="float" />
-        <add name="Color 2 End Percent" type="float" />
-        <add name="Color 2 Start Percent" type="float" default="1.0" />
+        <add name="Fade In Percent" type="float" default="0.1" range="#F0_1#" />
+        <add name="Fade Out Percent" type="float" default="0.9" range="#F0_1#" />
+        <add name="Color 1 End Percent" type="float" range="#F0_1#" />
+        <add name="Color 1 Start Percent" type="float" range="#F0_1#" />
+        <add name="Color 2 End Percent" type="float" range="#F0_1#" />
+        <add name="Color 2 Start Percent" type="float" default="1.0" range="#F0_1#" />
         <add name="Colors" type="Color4" arr1="3" />
     </niobject>
 
@@ -6615,7 +6636,7 @@
         as their Radius values differ in function. (Sphere/Capsule radius = physical size, CVS radius = padding/shell)
         
         Shapes collected in a bhkConvexListShape may not have the correct material noise.
-        <add name="Num Sub Shapes" type="uint" calc="(#LEN[Sub Shapes]# #LT# 255) #THEN# #LEN[Sub Shapes]# #ELSE# 255" />
+        <add name="Num Sub Shapes" type="uint" default="1" range="1:255" />
         <add name="Sub Shapes" type="Ref" template="bhkConvexShapeBase" arr1="Num Sub Shapes">List of shapes. Max of 255.</add>
         <add name="Material" type="HavokMaterial">The material of the shape.</add>
         <add name="Radius" type="float" />
@@ -7955,9 +7976,9 @@
 
 	<niobject name="BSLagBoneController" inherit="NiTimeController" module="BSAnimation" versions="#SKY_AND_LATER#">
     A controller that trails a bone behind an actor.
-		<add name="Linear Velocity" type="float" default="3.0">How long it takes to rotate about an actor back to rest position.</add>
-		<add name="Linear Rotation" type="float" default="1.0">How the bone lags rotation</add>
-		<add name="Maximum Distance" type="float" default="400.0">How far bone will tail an actor.</add>
+		<add name="Linear Velocity" type="float" default="3.0" range="0.0:500.0">How long it takes to rotate about an actor back to rest position.</add>
+		<add name="Linear Rotation" type="float" default="1.0" range="0.0:15.0">How the bone lags rotation</add>
+		<add name="Maximum Distance" type="float" default="400.0" range="#F0_1000#">How far bone will tail an actor.</add>
 	</niobject>
 
 	<niobject name="BSLODTriShape" inherit="NiTriBasedGeom" module="BSMain" versions="#SKY# #SSE#">
@@ -8016,7 +8037,7 @@
     <compound name="BSGeometryPerSegmentSharedData" size="16" versions="#FO4#">
         <add name="User Index" type="uint">If Bone ID is 0xffffffff, this value refers to the Segment at the listed index. Otherwise this is the "Biped Object", which is like the body part types in Skyrim and earlier.</add>
         <add name="Bone ID" type="uint" default="#UINT_MAX#">A hash of the bone name string.</add>
-        <add name="Num Cut Offsets" type="uint" calc="(#LEN[Cut Offsets]# #LT# 8) #THEN# #LEN[Cut Offsets]# #ELSE# 8">Maximum of 8.</add>
+        <add name="Num Cut Offsets" type="uint" range="0:8">Maximum of 8.</add>
         <add name="Cut Offsets" type="float" arr1="Num Cut Offsets" />
     </compound>
 

From a8a425b5e3e2cebfccfd0087eaec43141a81414c Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Mon, 13 Aug 2018 06:29:49 -0400
Subject: [PATCH 76/86] Add missing token for aa05717

For #70 and #76
---
 nif.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nif.xml b/nif.xml
index e0b9bbd..97c9ae9 100644
--- a/nif.xml
+++ b/nif.xml
@@ -181,6 +181,7 @@
         <range token="#FPM_PI#" string="-3.1415926:3.1415926" />
         <range token="#FPM_10#" string="-10.0:10.0" />
         <range token="#FPM_100#" string="-100.0:100.0" />
+        <range token="#FPM_1000#" string="-1000.0:1000.0" />
     </token>
 
     <token name="global" attrs="vercond">

From 1889e4ee3054183f58fea427c95c4c325186bb79 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 30 Aug 2018 20:48:44 -0400
Subject: [PATCH 77/86] [Linting] Float defaults without decimals

---
 nif.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nif.xml b/nif.xml
index 97c9ae9..76a727a 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2236,8 +2236,8 @@
         Bethesda extension of hkpVelocityConstraintMotor. Tries to reach and keep a desired target velocity.
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
-        <add name="Tau" type="float" default="0">Relative stiffness</add>
-        <add name="Target Velocity" type="float" default="0" />
+        <add name="Tau" type="float" default="0.0">Relative stiffness</add>
+        <add name="Target Velocity" type="float" default="0.0" />
         <add name="Use Velocity Target" type="bool" default="0" />
         <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
     </compound>
@@ -2247,8 +2247,8 @@
         Tries to reach a given target position using an angular spring which has a spring constant.
         <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
         <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
-        <add name="Spring Constant" type="float" default="0">The spring constant in N/m</add>
-        <add name="Spring Damping" type="float" default="0">The spring damping in Nsec/m</add>
+        <add name="Spring Constant" type="float" default="0.0">The spring constant in N/m</add>
+        <add name="Spring Damping" type="float" default="0.0">The spring damping in Nsec/m</add>
         <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
     </compound>
     
@@ -6414,7 +6414,7 @@
         <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T">How to handle texture borders.</add>
         <add name="Alpha" type="float" default="1.0" range="0.0:128.0">The material opacity (1=opaque). Greater than 1.0 is used to affect alpha falloff i.e. staying opaque longer based on vertex alpha and alpha mask.</add>
         <add name="Refraction Strength" type="float" range="#F0_1#">The amount of distortion. **Not based on physically accurate refractive index** (0=none)</add>
-        <add name="Glossiness" type="float" default="80" range="#F0_999#" vercond="#NI_BS_LT_FO4#">The material specular power, or glossiness.</add>
+        <add name="Glossiness" type="float" default="80.0" range="#F0_999#" vercond="#NI_BS_LT_FO4#">The material specular power, or glossiness.</add>
         <add name="Smoothness" type="float" default="1.0" range="#F0_1#" vercond="#BS_FO4#">The base roughness, multiplied by the smoothness map.</add>
         <add name="Specular Color" type="Color3" default="#VEC3_ONE#">Adds a colored highlight.</add>
         <add name="Specular Strength" type="float" default="1.0" range="#F0_10#">Brightness of specular highlight. (0=not visible)</add>

From 218799ac3a900ec16dc0a77e73791df1200cddc5 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Thu, 30 Aug 2018 22:13:07 -0400
Subject: [PATCH 78/86] BS PCD Shared decoding

The way that BSPackedCombinedSharedGeomDataExtra refers to the shared geometry was decoded.  It stores the hash of the filename and the offset to the data.
---
 nif.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nif.xml b/nif.xml
index 76a727a..734e1fd 100644
--- a/nif.xml
+++ b/nif.xml
@@ -8191,9 +8191,9 @@
     </compound>
 
     <compound name="BSPackedGeomObject" size="8" versions="#FO4#">
-        This appears to be a 64-bit hash but nif.xml does not have a 64-bit type.
-        <add name="Shape ID 1" type="uint" />
-        <add name="Shape ID 2" type="uint" />
+        This is the data necessary to access the shared geometry in a PSG/CSG file.
+        <add name="Filename Hash" type="uint">BSCRC32 of the filename without the PSG/CSG extension.</add>
+        <add name="Data Offset" type="uint">Offset of the geometry data in the PSG/CSG file.</add>
     </compound>
 
     <niobject name="BSPackedCombinedGeomDataExtra" inherit="NiExtraData" module="BSMain" versions="#FO4#">
@@ -8210,8 +8210,7 @@
 
     <niobject name="BSPackedCombinedSharedGeomDataExtra" inherit="NiExtraData" module="BSMain" versions="#FO4#">
         Fallout 4 Packed Combined Shared Geometry Data.
-        Geometry is NOT baked into the file. It is instead a reference to the shape via a Shape ID (currently undecoded)
-        which loads the geometry via the STAT form for the NIF.
+        Geometry is NOT baked into the file. It is instead a reference to the geometry via a CSG filename hash and data offset.
         <add name="Vertex Desc" type="BSVertexDesc" />
         <add name="Num Vertices" type="uint" />
         <add name="Num Triangles" type="uint" />

From fdcba77f5e4f03d3745ec16db762f63dc9d6483a Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sat, 1 Sep 2018 11:44:38 -0400
Subject: [PATCH 79/86] Legacy NiParticle decoding

NetImmerse NiParticle (called NiOldParticle after Gamebryo 1.1) was severely undecoded.  This affects several NetImmerse games like Morrowind and Freedom Force.

The per-particle info in NiOldParticle actually remained identical to the class in NiParticle, which is named "NiParticleInfo".  It did however have a different name in NetImmerse which was "NiPerParticleData".  Since they were the same data, the two compounds were merged and NiPSysData was updated.
---
 nif.xml | 132 +++++++++++++++++++++++++-------------------------------
 1 file changed, 59 insertions(+), 73 deletions(-)

diff --git a/nif.xml b/nif.xml
index 734e1fd..b77569b 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2146,15 +2146,16 @@
         <add name="Vectors" type="Vector3" arr1="#ARG#">Morph vectors.</add>
     </compound>
 
-    <compound name="Particle" size="40">
-        particle array entry
-        <add name="Velocity" type="Vector3">Particle velocity</add>
-        <add name="Unknown Vector" type="Vector3" />
-        <add name="Lifetime" type="float">The particle age.</add>
-        <add name="Lifespan" type="float">Maximum age of the particle.</add>
-        <add name="Timestamp" type="float">Timestamp of the last update.</add>
-        <add name="Unknown Short" type="ushort" default="0" />
-        <add name="Vertex ID" type="ushort">Particle/vertex index matches array index</add>
+    <compound name="NiParticleInfo" size="40">
+        Called NiPerParticleData in NiOldParticles.
+        Holds the state of a particle at the time the system was saved.
+        <add name="Velocity" type="Vector3">Particle direction and speed.</add>
+        <add name="Rotation Axis" type="Vector3" ver2="10.4.0.1" />
+        <add name="Age" type="float" />
+        <add name="Life Span" type="float" />
+        <add name="Last Update" type="float">Timestamp of the last update.</add>
+        <add name="Spawn Generation" type="ushort" default="0" />
+        <add name="Code" type="ushort">Usually matches array index</add>
     </compound>
 
     <compound name="BoneData">
@@ -3902,19 +3903,9 @@
         Particle system data object (with automatic normals?).
     </niobject>
 
-    <compound name="ParticleDesc">
-        Particle Description.
-        <add name="Translation" type="Vector3" />
-        <add name="Unknown Floats 1" type="float" arr1="3" ver2="10.4.0.1" />
-        <add name="Unknown Float 1" type="float" default="0.9" />
-        <add name="Unknown Float 2" type="float" default="0.9" />
-        <add name="Unknown Float 3" type="float" default="3.0" />
-        <add name="Unknown Int 1" type="int" />
-    </compound>
-
     <niobject name="NiPSysData" inherit="NiParticlesData" module="NiParticle">
         Particle system data.
-        <add name="Particle Descriptions" type="ParticleDesc" arr1="Num Vertices" vercond="!#BS202#" />
+        <add name="Particle Info" type="NiParticleInfo" arr1="Num Vertices" vercond="!#BS202#" />
         <add name="Has Rotation Speeds" type="bool" ver1="20.0.0.2" />
         <add name="Rotation Speeds" type="float" arr1="Num Vertices" cond="Has Rotation Speeds" ver1="20.0.0.2" vercond="!#BS202#" />
         <add name="Num Added Particles" type="ushort" vercond="!#BS202#" />
@@ -4165,7 +4156,7 @@
 
     <niobject name="NiGravity" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier. Applies a gravitational field on the particles.
-        <add name="Unknown Float 1" type="float" ver1="3.3.0.13" />
+        <add name="Decay" type="float" ver1="3.3.0.13" />
         <add name="Force" type="float">The strength/force of this gravity.</add>
         <add name="Type" type="FieldType">The force field type.</add>
         <add name="Position" type="Vector3">The position of the mass point relative to the particle system.</add>
@@ -4411,7 +4402,7 @@
 
     <niobject name="NiParticleMeshesData" inherit="NiRotatingParticlesData" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1). Particle meshes data.
-        <add name="Unknown Link 2" type="Ref" template="NiAVObject" />
+        <add name="Container Node" type="Ref" template="NiNode" />
     </niobject>
 
     <niobject name="NiParticleSystem" inherit="NiParticles" module="NiParticle">
@@ -4434,38 +4425,44 @@
         Particle system.
     </niobject>
 
+    <niobject name="NiEmitterModifier" inherit="NiObject" module="NiLegacy" until="V10_0_1_0">
+        <add name="Next Modifier" type="Ref" template="NiEmitterModifier" />
+        <add name="Controller" type="Ptr" template="NiParticleSystemController" />
+    </niobject>
+
     <niobject name="NiParticleSystemController" inherit="NiTimeController" module="NiLegacy" until="V10_0_1_0">
         A generic particle system time controller object.
         <add name="Old Speed" type="uint" ver2="3.1">Particle speed in old files</add>
         <add name="Speed" type="float" ver1="3.3.0.13">Particle speed</add>
-        <add name="Speed Random" type="float">Particle random speed modifier</add>
-        <add name="Vertical Direction" type="float">
+        <add name="Speed Variation" type="float">Particle random speed modifier</add>
+        <add name="Declination" type="float">
             vertical emit direction [radians]
             0.0 : up
             1.6 : horizontal
             3.1416 : down
         </add>
-        <add name="Vertical Angle" type="float">emitter's vertical opening angle [radians]</add>
-        <add name="Horizontal Direction" type="float">horizontal emit direction</add>
-        <add name="Horizontal Angle" type="float">emitter's horizontal opening angle</add>
-        <add name="Unknown Normal" type="Vector3" />
-        <add name="Unknown Color" type="Color4" />
-        <add name="Size" type="float">Particle size</add>
+        <add name="Declination Variation" type="float">emitter's vertical opening angle [radians]</add>
+        <add name="Planar Angle" type="float">horizontal emit direction</add>
+        <add name="Planar Angle Variation" type="float">emitter's horizontal opening angle</add>
+        <add name="Initial Normal" type="Vector3" default="#X_AXIS#" />
+        <add name="Initial Color" type="Color4" default="#VEC4_ONE#" />
+        <add name="Initial Size" type="float" default="1.0">Particle size</add>
         <add name="Emit Start Time" type="float">Particle emit start time</add>
         <add name="Emit Stop Time" type="float">Particle emit stop time</add>
-        <add name="Unknown Byte" type="byte" ver1="3.3.0.13" />
+        <add name="Reset Particle System" type="byte" ver1="3.3.0.13" />
         <add name="Old Emit Rate" type="uint" ver2="3.1">Particle emission rate in old files</add>
-        <add name="Emit Rate" type="float" ver1="3.3.0.13">Particle emission rate (particles per second)</add>
+        <add name="Birth Rate" type="float" ver1="3.3.0.13">Particle emission rate (particles per second)</add>
         <add name="Lifetime" type="float">Particle lifetime</add>
-        <add name="Lifetime Random" type="float">Particle lifetime random modifier</add>
-        <add name="Emit Flags" type="ushort" ver1="3.3.0.13">Bit 0: Emit Rate toggle bit (0 = auto adjust, 1 = use Emit Rate value)</add>
-        <add name="Start Random" type="Vector3">Particle random start translation vector</add>
-        <add name="Emitter" type="Ptr" template="NiObject">This index targets the particle emitter object (TODO: find out what type of object this refers to).</add>
-        <add name="Unknown Short 2" type="ushort" ver1="3.3.0.13" />
-        <add name="Unknown Float 13" type="float" ver1="3.3.0.13" />
-        <add name="Unknown Int 1" type="uint" ver1="3.3.0.13" />
-        <add name="Unknown Int 2" type="uint" ver1="3.3.0.13" />
-        <add name="Unknown Short 3" type="ushort" ver1="3.3.0.13" />
+        <add name="Lifetime Variation" type="float">Particle lifetime random modifier</add>
+        <add name="Use Birth Rate" type="byte" ver1="3.3.0.13" />
+        <add name="Spawn On Death" type="byte" ver1="3.3.0.13" />
+        <add name="Emitter Dimensions" type="Vector3" />
+        <add name="Emitter" type="Ptr" template="NiAVObject">The object which acts as the basis for the particle emitter.</add>
+        <add name="Num Spawn Generations" type="ushort" default="1" ver1="3.3.0.13" />
+        <add name="Percentage Spawned" type="float" default="1.0" ver1="3.3.0.13" />
+        <add name="Spawn Multiplier" type="ushort" ver1="3.3.0.13" />
+        <add name="Spawn Speed Chaos" type="float" ver1="3.3.0.13" />
+        <add name="Spawn Dir Chaos" type="float" ver1="3.3.0.13" />
         <add name="Particle Velocity" type="Vector3" ver2="3.1">Particle velocity</add>
         <add name="Particle Unknown Vector" type="Vector3" ver2="3.1" />
         <add name="Particle Lifetime" type="float" ver2="3.1">The particle's age.</add>
@@ -4476,11 +4473,11 @@
 
         <add name="Num Particles" type="ushort" ver1="3.3.0.13">Size of the following array. (Maximum number of simultaneous active particles)</add>
         <add name="Num Valid" type="ushort" ver1="3.3.0.13">Number of valid entries in the following array. (Number of active particles at the time the system was saved)</add>
-        <add name="Particles" type="Particle" arr1="Num Particles" ver1="3.3.0.13">Individual particle modifiers?</add>
-        <add name="Unknown Link" type="Ref" template="NiObject" ver1="3.3.0.13" />
-        <add name="Particle Extra" type="Ref" template="NiParticleModifier">Link to some optional particle modifiers (NiGravity, NiParticleGrowFade, NiParticleBomb, ...)</add>
-        <add name="Unknown Link 2" type="Ref" template="NiObject" />
-        <add name="Trailer" type="byte" ver1="4.0.0.2">Trailing null byte</add>
+        <add name="Particles" type="NiParticleInfo" arr1="Num Particles" ver1="3.3.0.13" />
+        <add name="Emitter Modifier" type="Ref" template="NiEmitterModifier" ver1="3.3.0.13" />
+        <add name="Particle Modifier" type="Ref" template="NiParticleModifier">Link to some optional particle modifiers (NiGravity, NiParticleGrowFade, NiParticleBomb, ...)</add>
+        <add name="Particle Collider" type="Ref" template="NiParticleCollider" />
+        <add name="Static Target Bound" type="byte" ver1="3.3.0.15" />
         <add name="Color Data" type="Ref" template="NiColorData" ver2="3.1" />
         <add name="Unknown Float 1" type="float" ver2="3.1" />
         <add name="Unknown Floats 2" arr1="Particle Unknown Short" type="float" ver2="3.1" />
@@ -4562,26 +4559,20 @@
         <add name="Pixel Data" type="byte" binary="true" arr1="Num Pixels * Num Faces" ver1="10.4.0.2" />
     </niobject>
 
-    <niobject name="NiPlanarCollider" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
+    <niobject name="NiParticleCollider" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
+        <add name="Bounce" type="float" />
+        <add name="Spawn On Collide" type="bool" ver1="4.2.0.2" />
+        <add name="Die On Collide" type="bool" ver1="4.2.0.2" />
+    </niobject>
+
+    <niobject name="NiPlanarCollider" inherit="NiParticleCollider" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Unknown Short" type="ushort" ver1="10.0.1.0" />
-        <add name="Unknown Float 1" type="float" />
-        <add name="Unknown Float 2" type="float" />
-        <add name="Unknown Short 2" type="ushort" ver1="4.2.2.0" ver2="4.2.2.0" />
-        <add name="Unknown Float 3" type="float" />
-        <add name="Unknown Float 4" type="float" />
-        <add name="Unknown Float 5" type="float" />
-        <add name="Unknown Float 6" type="float" />
-        <add name="Unknown Float 7" type="float" />
-        <add name="Unknown Float 8" type="float" />
-        <add name="Unknown Float 9" type="float" />
-        <add name="Unknown Float 10" type="float" />
-        <add name="Unknown Float 11" type="float" />
-        <add name="Unknown Float 12" type="float" />
-        <add name="Unknown Float 13" type="float" />
-        <add name="Unknown Float 14" type="float" />
-        <add name="Unknown Float 15" type="float" />
-        <add name="Unknown Float 16" type="float" />
+        <add name="Height" type="float" />
+        <add name="Width" type="float" />
+        <add name="Position" type="Vector3" />
+        <add name="X Vector" type="Vector3" />
+        <add name="Y Vector" type="Vector3" />
+        <add name="Plane" type="NiPlane" />
     </niobject>
 
     <niobject name="NiPointLight" inherit="NiLight" module="NiMain">
@@ -5014,15 +5005,10 @@
         <add name="Flags" type="SpecularFlags" />
     </niobject>
 
-    <niobject name="NiSphericalCollider" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
+    <niobject name="NiSphericalCollider" inherit="NiParticleCollider" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Unknown Float 1" type="float" />
-        <add name="Unknown Short 1" type="ushort" />
-        <add name="Unknown Float 2" type="float" />
-        <add name="Unknown Short 2" type="ushort" ver2="4.2.0.2" />
-        <add name="Unknown Float 3" type="float" ver1="4.2.1.0" />
-        <add name="Unknown Float 4" type="float" />
-        <add name="Unknown Float 5" type="float" />
+        <add name="Radius" type="float" />
+        <add name="Position" type="Vector3" />
     </niobject>
 
     <niobject name="NiSpotLight" inherit="NiPointLight" module="NiMain">

From 63609e6981de4264b7c3f063956776be4c8ae877 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sun, 2 Sep 2018 18:12:08 -0400
Subject: [PATCH 80/86] Misc decoding, custom blocks for WorldShift, Guild 2

Decoded some unknown fields and blocks for WorldShift and Guild 2.

NiSourceTexture is now correctly decoded.  The unknown byte actually controls whether the image data Ref gets serialized or not, but it was always 1.  The addition of another conditional value increases the complexity for Pixel Data to 3 rows, all exclusive by version or condition.
---
 nif.xml | 55 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/nif.xml b/nif.xml
index b77569b..ad6f715 100644
--- a/nif.xml
+++ b/nif.xml
@@ -47,9 +47,9 @@
     <version id="V10_2_0_0" num="10.2.0.0" user="0">{{Pro Cycling Manager}}, {{Prison Tycoon}}, {{Red Ocean}}, {{Wildlife Park 2}}, Civilization IV, Loki</version>
     <version id="V10_2_0_0__1" num="10.2.0.0" user="1">{{Blood Bowl}}</version>
     <version id="V10_2_0_0__10" num="10.2.0.0" user="10" bsver="6 7 8 9">Oblivion</version>
-    <version id="V10_2_0_1" num="10.2.0.1" custom="true">Worldshift</version>
-    <version id="V10_3_0_1" num="10.3.0.1" custom="true">Worldshift</version>
-    <version id="V10_4_0_1" num="10.4.0.1" custom="true">{{Worldshift}}</version>
+    <version id="V10_2_0_1" num="10.2.0.1" custom="true">WorldShift</version>
+    <version id="V10_3_0_1" num="10.3.0.1" custom="true">WorldShift</version>
+    <version id="V10_4_0_1" num="10.4.0.1" custom="true">{{WorldShift}}</version>
     <version id="V20_0_0_4" num="20.0.0.4" user="0">{{Civilization IV}}, {{Sid Meier's Railroads}}, Florensia, Ragnarok Online 2, IRIS Online</version>
     <version id="V20_0_0_4__10" num="20.0.0.4" user="10" bsver="11">{{Oblivion KF}}</version>
     <version id="V20_0_0_4__11" num="20.0.0.4" user="11" bsver="11">Fallout 3</version>
@@ -2073,11 +2073,17 @@
         <add name="Constant" type="float">The plane constant.</add>
     </compound>
 
+    <compound name="NiBoundAABB" size="26">
+        Divinity 2 specific NiBound extension.
+        <add name="Num Corners" type="ushort" default="2" />
+        <add name="Corners" type="Vector3" arr1="2">Corners are only non-zero if Num Corners is 2. Hardcoded to 2.</add>
+    </compound>
+
     <compound name="NiBound">
         A sphere.
         <add name="Center" type="Vector3">The sphere's center.</add>
         <add name="Radius" type="float">The sphere's radius.</add>
-        <add name="DIV2 13 Shorts" type="short" arr1="13" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
+        <add name="DIV2 AABB" type="NiBoundAABB" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
     </compound>
 
     <compound name="NiCurve3">
@@ -3417,6 +3423,7 @@
         <option value="5000" name="ORDER_COLLIDER" />
         <option value="6000" name="ORDER_POS_UPDATE" />
         <option value="6500" name="ORDER_POSTPOS_UPDATE" />
+        <option value="6600" name="ORDER_WORLDSHIFT_PARTSPAWN" />
         <option value="7000" name="ORDER_BOUND_UPDATE" />
         <option value="8000" name="ORDER_SK_BSSTRIPUPDATE" />
     </enum>
@@ -3451,6 +3458,7 @@
             <default type="BSPSysLODModifier" value="ORDER_BSLOD" />
             <default type="BSPSysStripUpdateModifier" value="ORDER_FO3_BSSTRIPUPDATE" versions="V20_2_0_7_FO3" />
             <default type="BSPSysStripUpdateModifier" value="ORDER_SK_BSSTRIPUPDATE" versions="V20_2_0_7_SKY V20_2_0_7_SSE" />
+            <default type="NiPSysPartSpawnModifier" value="ORDER_WORLDSHIFT_PARTSPAWN" />
         </add>
         <add name="Target" type="Ptr" template="NiParticleSystem">NiParticleSystem parent of this modifier.</add>
         <add name="Active" type="bool" default="1">Whether or not the modifier is active.</add>
@@ -3505,7 +3513,7 @@
         Time controller for geometry morphing.
         <add name="Morpher Flags" type="GeomMorpherFlags" ver1="10.0.1.2" />
         <add name="Data" type="Ref" template="NiMorphData">Geometry morphing data index.</add>
-        <add name="Always Update" type="byte" ver1="4.0.0.1" />
+        <add name="Always Update" type="byte" ver1="4.0.0.2" />
         <add name="Num Interpolators" type="uint" ver1="10.1.0.106" />
         <add name="Interpolators" type="Ref" template="NiInterpolator" arr1="Num Interpolators" ver1="10.1.0.106" ver2="20.0.0.5" />
         <add name="Interpolator Weights" type="MorphWeight" arr1="Num Interpolators" ver1="20.1.0.3" />
@@ -4757,17 +4765,17 @@
         <add name="Percentage Spawned" type="float" default="1.0">The likelihood of a particular particle being spawned. Must be between 0.0 and 1.0.</add>
         <add name="Min Num to Spawn" type="ushort" default="1">The minimum particles to spawn for any given original particle.</add>
         <add name="Max Num to Spawn" type="ushort" default="1">The maximum particles to spawn for any given original particle.</add>
-        <add name="WorldShift Unknown Int" type="int" ver1="10.2.0.1" ver2="10.4.0.1" />
         <add name="Spawn Speed Variation" type="float">How much the spawned particle speed can vary.</add>
         <add name="Spawn Dir Variation" type="float">How much the spawned particle direction can vary.</add>
         <add name="Life Span" type="float">Lifespan assigned to spawned particles.</add>
         <add name="Life Span Variation" type="float">The amount the lifespan can vary.</add>
+        <add name="WorldShift Spawn Speed Addition" type="float" ver1="10.2.0.1" ver2="10.4.0.1" />
     </niobject>
 
     <niobject name="NiPSysPartSpawnModifier" inherit="NiPSysModifier" module="NiCustom" versions="V10_2_0_1 V10_3_0_1 V10_4_0_1">
         WorldShift-specific Particle Spawn modifier
-        <add name="Unknown Float 1" type="float" />
-        <add name="Unknown Float 2" type="float" />
+        <add name="Particles Per Second" type="float" default="40.0" />
+        <add name="Time" type="float" default="#FLT_MIN#">Default of FLT_MIN would indicate End Time but it seems more like Frequency/Tick Rate or Start Time.</add>
         <add name="Spawner" type="Ref" template="NiPSysSpawnModifier" />
     </niobject>
 
@@ -4882,19 +4890,15 @@
         <add name="Spread" type="float" range="#F0_1#">The angle of the air field cone if Enable Spread is true.</add>
     </niobject>
     
-    <niobject name="NiPSysTrailEmitter" inherit="NiPSysEmitter" module="NiCustom">
+    <niobject name="NiPSysTrailEmitter" inherit="NiPSysSphereEmitter" module="NiCustom">
         Guild 2-Specific node
-        <add name="Unknown Int 1" type="int" />
-        <add name="Unknown Float 1" type="float" />
-        <add name="Unknown Float 2" type="float" />
-        <add name="Unknown Float 3" type="float" />
-        <add name="Unknown Int 2" type="int" />
-        <add name="Unknown Float 4" type="float" />
-        <add name="Unknown Int 3" type="int" />
-        <add name="Unknown Float 5" type="float" />
-        <add name="Unknown Int 4" type="int" />
-        <add name="Unknown Float 6" type="float" />
-        <add name="Unknown Float 7" type="float" />
+        <add name="Trail Life Span" type="float" />
+        <add name="Trail Life Span Var" type="float" />
+        <add name="Num Trails" type="int" />
+        <add name="Gravity Force" type="float" />
+        <add name="Gravity Dir" type="Vector3" />
+        <add name="Turbulence" type="float" />
+        <add name="Repeat Time" type="float" />
     </niobject>
 
     <niobject name="NiLightIntensityController" inherit="NiFloatInterpController" module="NiAnimation">
@@ -4989,11 +4993,12 @@
     <niobject name="NiSourceTexture" inherit="NiTexture" module="NiMain">
         Describes texture source and properties.
         <add name="Use External" type="byte" default="1">Is the texture external?</add>
+        <add name="Use Internal" type="byte" default="1" cond="Use External == 0" ver2="10.0.1.3" />
         <add name="File Name" type="FilePath" cond="Use External == 1">The external texture file name.</add>
-        <add name="Unknown Link" type="Ref" template="NiObject" cond="Use External == 1" ver1="10.1.0.0" />
-        <add name="Unknown Byte" type="byte" default="1" cond="Use External == 0" ver2="10.0.1.0" />
         <add name="File Name" type="FilePath" cond="Use External == 0" ver1="10.1.0.0">The original source filename of the image embedded by the referred NiPixelData object.</add>
-        <add name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 0">NiPixelData or NiPersistentSrcTextureRendererData</add>
+        <add name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 1" ver1="10.1.0.0" />
+        <add name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 0 #AND# Use Internal == 1" ver2="10.0.1.3">NiPixelData or NiPersistentSrcTextureRendererData</add>
+        <add name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 0" ver1="10.0.1.4">NiPixelData or NiPersistentSrcTextureRendererData</add>
         <add name="Format Prefs" type="FormatPrefs">A set of preferences for the texture format. They are a request only and the renderer may ignore them.</add>
         <add name="Is Static" type="byte" default="1">If set, then the application cannot assume that any dynamic changes to the pixel data will show in the rendered image.</add>
         <add name="Direct Render" type="bool" default="1" ver1="10.1.0.103">A hint to the renderer that the texture can be loaded directly from a texture file into a renderer-specific resource, bypassing the NiPixelData object.</add>
@@ -5060,7 +5065,7 @@
     <niobject name="NiTextureEffect" inherit="NiDynamicEffect" module="NiMain">
         Represents an effect that uses projected textures such as projected lights (gobos), environment maps, and fog maps.
         <add name="Model Projection Matrix" type="Matrix33">Model projection matrix.  Always identity?</add>
-        <add name="Model Projection Transform" type="Vector3">Model projection transform.  Always (0,0,0)?</add>
+        <add name="Model Projection Translation" type="Vector3">Model projection translation.  Always (0,0,0)?</add>
         <add name="Texture Filtering" type="TexFilterMode" default="FILTER_TRILERP">Texture Filtering mode.</add>
         <add name="Max Anisotropy" type="ushort" ver1="20.5.0.4" />
         <add name="Texture Clamping" type="TexClampMode" default="WRAP_S_WRAP_T">Texture Clamp mode.</add>
@@ -5249,7 +5254,7 @@
     <niobject name="NiUVController" inherit="NiTimeController" module="NiAnimation" until="V20_2_0_8">
         DEPRECATED (pre-10.1), REMOVED (20.3).
         Time controller for texture coordinates.
-        <add name="Unknown Short" type="ushort" />
+        <add name="Texture Set" type="ushort" />
         <add name="Data" type="Ref" template="NiUVData">Texture coordinate controller data index.</add>
     </niobject>
 

From 6ca49fd482f444799a506724b92d59237cd4dabe Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Fri, 2 Nov 2018 04:14:19 -0400
Subject: [PATCH 81/86] [Linting] Reorder defaults to keep ancestor types above
 children

Even though in these cases it doesn't matter because of version exclusivity, keep them ordered by type instead of grouped by version.
---
 nif.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nif.xml b/nif.xml
index ad6f715..9a6835b 100644
--- a/nif.xml
+++ b/nif.xml
@@ -3294,12 +3294,12 @@
             OB-FO3: Add 0x28 (SET_LOCAL | USE_VEL) for ANIM_STATIC layer objects.
             Post-FO3: Always add 0x80 (SYNC_ON_UPDATE).
             <default type="bhkCollisionObject" value="0x81" />
-            <default type="bhkPCollisionObject" value="0x81" />
-            <default type="bhkSPCollisionObject" value="0x81" />
-            <default type="bhkBlendCollisionObject" value="0x89" />
             <default type="bhkCollisionObject" value="0x1" versions="V20_2_0_7_FO3 V20_0_0_5_OBL" />
+            <default type="bhkPCollisionObject" value="0x81" />
             <default type="bhkPCollisionObject" value="0x1" versions="V20_2_0_7_FO3 V20_0_0_5_OBL" />
+            <default type="bhkSPCollisionObject" value="0x81" />
             <default type="bhkSPCollisionObject" value="0x1" versions="V20_2_0_7_FO3 V20_0_0_5_OBL" />
+            <default type="bhkBlendCollisionObject" value="0x89" />
             <default type="bhkBlendCollisionObject" value="0x9" versions="V20_2_0_7_FO3 V20_0_0_5_OBL" />
         </add>
         <add name="Body" type="Ref" template="bhkWorldObject" />
@@ -3342,8 +3342,6 @@
             <default type="BSTriShape" value="0xE" />
             <default type="BSTriShape" value="0x8000E" versions="V20_2_0_7_SSE" />
             <default type="BSSubIndexTriShape" value="0xE" />
-            <default type="BSSegmentedTriShape" value="0xE" />
-            <default type="BSSegmentedTriShape" value="0x8000E" versions="V20_2_0_7_FO3" />
             <default type="BSMeshLODTriShape" value="0x100E" />
             <default type="BSFadeNode" value="0x8000E" />
             <default type="NiParticleSystem" value="0x8000E" />
@@ -3353,18 +3351,20 @@
             <default type="BSStripParticleSystem" value="0x8000E" />
             <default type="NiTriShape" value="0x8000E" />
             <default type="NiTriStrips" value="0x8000E" />
+            <default type="BSSegmentedTriShape" value="0xE" />
+            <default type="BSSegmentedTriShape" value="0x8000E" versions="V20_2_0_7_FO3" />
             <default type="BSLeafAnimNode" value="0x808000E" />
             <default type="BSLeafAnimNode" value="0x500E" versions="V20_2_0_7_FO4" />
             <default type="BSTreeNode" value="0x8080E" />
             <default type="BSTreeNode" value="0x400E" versions="V20_2_0_7_FO4" />
             <default type="BSDebrisNode" value="0x8000F" />
             <default type="BSBlastNode" value="0x8000F" />
+            <default type="BSBlastNode" value="0x2000000F" versions="V20_2_0_7_FO4" />
             <default type="BSDamageStage" value="0x8000F" />
+            <default type="BSDamageStage" value="0x2000000F" versions="V20_2_0_7_FO4" />
             <default type="BSOrderedNode" value="0x8200E" />
             <default type="BSOrderedNode" value="0x200E" versions="V20_2_0_7_FO4" />
             <default type="BSOrderedNode" value="0x8000E" versions="V20_2_0_7_FO3" />
-            <default type="BSBlastNode" value="0x2000000F" versions="V20_2_0_7_FO4" />
-            <default type="BSDamageStage" value="0x2000000F" versions="V20_2_0_7_FO4" />
             <default type="BSLODTriShape" value="0x800000E" versions="V20_2_0_7_SSE" />
             <default type="BSLODTriShape" value="0x808000E" versions="V20_2_0_7_SKY" />
         </add>

From 02799d81d64cbef92d1676a6dbcca8dc97f4f7b1 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Sun, 2 Dec 2018 08:08:02 -0500
Subject: [PATCH 82/86] Initial BSStream 155 commit

Renamed BSLightingShaderPropertyShaderType and its associated name field ("Skyrim Shader Type" -> "Shader Type").

BSDistantObjectInstancedNode is mostly undecoded but fully readable.

Treatment of shader flags is preliminary and will change over time.
---
 nif.xml | 305 ++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 221 insertions(+), 84 deletions(-)

diff --git a/nif.xml b/nif.xml
index 9a6835b..70d3d92 100644
--- a/nif.xml
+++ b/nif.xml
@@ -68,6 +68,7 @@
     <version id="V20_2_0_7_SKY" num="20.2.0.7" user="12" bsver="83" ext="bto btr">{{Skyrim}}</version>
     <version id="V20_2_0_7_SSE" num="20.2.0.7" user="12" bsver="100" ext="bto btr">{{Skyrim SE}}</version>
     <version id="V20_2_0_7_FO4" num="20.2.0.7" user="12" bsver="130" ext="bto btr">{{Fallout 4}}</version>
+    <version id="V20_2_0_7_F76" num="20.2.0.7" user="12" bsver="155" ext="bto">{{Fallout 76}}</version>
     <version id="V20_2_0_8" num="20.2.0.8" ext="nifcache">{{Empire Earth III}}, {{FFT Online}}, Atlantica Online, IRIS Online, Wizard101</version>
     <version id="V20_3_0_1" num="20.3.0.1">Emerge</version>
     <version id="V20_3_0_2" num="20.3.0.2">Emerge</version>
@@ -109,12 +110,15 @@
         <verexpr token="#NI_BS_LTE_FO3#" string="(#BSVER# #LTE# 34)">All NI + BS until Fallout 3.</verexpr>
         <verexpr token="#NI_BS_LT_SSE#" string="(#BSVER# #LT# 100)">All NI + BS before SSE.</verexpr>
         <verexpr token="#NI_BS_LT_FO4#" string="(#BSVER# #LT# 130)">All NI + BS before Fallout 4.</verexpr>
+        <verexpr token="#NI_BS_LTE_FO4#" string="(#BSVER# #LTE# 130)">All NI + BS until Fallout 4.</verexpr>
         <verexpr token="#BS_GT_FO3#" string="(#BSVER# #GT# 34)">Skyrim, SSE, and Fallout 4</verexpr>
         <verexpr token="#BS_GTE_FO3#" string="(#BSVER# #GTE# 34)">FO3 and later.</verexpr>
         <verexpr token="#BS_GTE_SKY#" string="(#BSVER# #GTE# 83)">Skyrim and later.</verexpr>
         <verexpr token="#BS_GTE_SSE#" string="(#BSVER# #GTE# 100)">SSE and later.</verexpr>
         <verexpr token="#BS_SSE#" string="(#BSVER# #EQ# 100)">SSE only.</verexpr>
         <verexpr token="#BS_FO4#" string="(#BSVER# #EQ# 130)">Fallout 4 only.</verexpr>
+        <verexpr token="#BS_GTE_FO4#" string="(#BSVER# #GTE# 130)">Fallout 4 and FO76.</verexpr>
+        <verexpr token="#BS_F76#" string="(#BSVER# #EQ# 155)">Fallout 76 only.</verexpr>
         <verexpr token="#BS202#" string="((#VER# #EQ# 20.2.0.7) #AND# (#BSVER# #GT# 0))">Bethesda 20.2 only.</verexpr>
         <verexpr token="#DIVINITY2#" string="((#USER# #EQ# 0x20000) #OR# (#USER# #EQ# 0x30000))">Divinity 2</verexpr>
     </token>
@@ -125,13 +129,14 @@
 
     <token name="verset" attrs="versions">
         The set of versions that any Basic, Compound, NiObject, Enum, or Bitflags is restricted to.
-        <verset token="#BETHESDA#" string="V10_0_1_2 V10_1_0_101 V10_1_0_106 V10_2_0_0__10 V20_0_0_4__10 V20_0_0_4__11 V20_0_0_5_OBL V20_2_0_7__11_1 V20_2_0_7__11_2 V20_2_0_7__11_3 V20_2_0_7__11_4 V20_2_0_7__11_5 V20_2_0_7__11_6 V20_2_0_7__11_7 V20_2_0_7__11_8 V20_2_0_7_FO3 V20_2_0_7_SKY V20_2_0_7_SSE V20_2_0_7_FO4" />
+        <verset token="#BETHESDA#" string="V10_0_1_2 V10_1_0_101 V10_1_0_106 V10_2_0_0__10 V20_0_0_4__10 V20_0_0_4__11 V20_0_0_5_OBL V20_2_0_7__11_1 V20_2_0_7__11_2 V20_2_0_7__11_3 V20_2_0_7__11_4 V20_2_0_7__11_5 V20_2_0_7__11_6 V20_2_0_7__11_7 V20_2_0_7__11_8 V20_2_0_7_FO3 V20_2_0_7_SKY V20_2_0_7_SSE V20_2_0_7_FO4 V20_2_0_7_F76" />
         <verset token="#FO3#" string="V20_0_0_4__11 V20_2_0_7__11_1 V20_2_0_7__11_2 V20_2_0_7__11_3 V20_2_0_7__11_4 V20_2_0_7__11_5 V20_2_0_7__11_6 V20_2_0_7__11_7 V20_2_0_7__11_8 V20_2_0_7_FO3" />
         <verset token="#SKY#" string="V20_2_0_7_SKY" />
         <verset token="#SSE#" string="V20_2_0_7_SSE" />
         <verset token="#FO4#" string="V20_2_0_7_FO4" />
-        <verset token="#FO3_AND_LATER#" string="V20_0_0_4__11 V20_2_0_7__11_1 V20_2_0_7__11_2 V20_2_0_7__11_3 V20_2_0_7__11_4 V20_2_0_7__11_5 V20_2_0_7__11_6 V20_2_0_7__11_7 V20_2_0_7__11_8 V20_2_0_7_FO3 V20_2_0_7_SKY V20_2_0_7_SSE V20_2_0_7_FO4" />
-        <verset token="#SKY_AND_LATER#" string="V20_2_0_7_SKY V20_2_0_7_SSE V20_2_0_7_FO4" />
+        <verset token="#F76#" string="V20_2_0_7_F76" />
+        <verset token="#FO3_AND_LATER#" string="V20_0_0_4__11 V20_2_0_7__11_1 V20_2_0_7__11_2 V20_2_0_7__11_3 V20_2_0_7__11_4 V20_2_0_7__11_5 V20_2_0_7__11_6 V20_2_0_7__11_7 V20_2_0_7__11_8 V20_2_0_7_FO3 V20_2_0_7_SKY V20_2_0_7_SSE V20_2_0_7_FO4 V20_2_0_7_F76" />
+        <verset token="#SKY_AND_LATER#" string="V20_2_0_7_SKY V20_2_0_7_SSE V20_2_0_7_FO4 V20_2_0_7_F76" />
     </token>
 
     <token name="default" attrs="default">
@@ -1324,7 +1329,7 @@
         <option value="13000" name="BP_TORSOSECTION_BRAIN">Torso Section | Brain</option>       
     </enum>
 	
-    <enum name="BSLightingShaderPropertyShaderType" storage="uint" prefix="ST" versions="#SKY_AND_LATER#">
+    <enum name="BSLightingShaderType" storage="uint" prefix="ST" versions="#SKY_AND_LATER#">
         Values for configuring the shader type in a BSLightingShaderProperty
         <option value="0" name="Default" />
         <option value="1" name="Environment Map">Enables EnvMap Mask(TS6), EnvMap Scale</option>
@@ -1349,6 +1354,15 @@
         <option value="20" name="FO4 Dismemberment" />
     </enum>
 
+    <enum name="BSLightingShaderType155" storage="uint" prefix="ST" versions="#F76#">
+        Values for configuring the shader type in a BSLightingShaderProperty
+        <option value="0" name="Default" />
+        <option value="2" name="Glow" />
+        <option value="3" name="Face Tint" />
+        <option value="4" name="Skin Tint" />
+        <option value="5" name="Hair Tint" />
+    </enum>
+
     <enum name="EffectShaderControlledVariable" storage="uint" prefix="ESCV" versions="#SKY_AND_LATER#">
         An unsigned 32-bit integer, describing which float variable in BSEffectShaderProperty to animate.
         <option value="0" name="EmissiveMultiple">EmissiveMultiple.</option>
@@ -1855,6 +1869,7 @@
     	Information about how the file was exported
         <add name="BS Version" type="ulittle32" />
         <add name="Author" type="ExportString" />
+        <add name="Unknown Int" type="uint" cond="BS Version #GT# 130" />
         <add name="Process Script" type="ExportString" />
         <add name="Export Script" type="ExportString" />
         <add name="Max Filepath" type="ExportString" cond="BS Version == 130" />
@@ -1974,7 +1989,7 @@
         <add name="v3" type="ushort">Third vertex index.</add>
     </compound>
 
-    <bitflags name="VertexAttribute" storage="ushort" prefix="VF" versions="#SSE# #FO4#">
+    <bitflags name="VertexAttribute" storage="ushort" prefix="VF" versions="#SSE# #FO4# #F76#">
         The bits of BSVertexDesc that describe the enabled vertex attributes.
         <option value="1" name="Vertex" />
         <option value="2" name="UVs" />
@@ -1989,7 +2004,7 @@
         <option value="11" name="Full_Precision" />
     </bitflags>
 
-    <bitfield name="BSVertexDesc" storage="uint64" versions="#SSE# #FO4#">
+    <bitfield name="BSVertexDesc" storage="uint64" versions="#SSE# #FO4# #F76#">
         <member width="4" pos="0" mask="0xF" name="Vertex Data Size" type="uint" />
         <member width="4" pos="4" mask="0xF0" name="Dynamic Vertex Size" type="uint" />
         <member width="4" pos="8" mask="0xF00" name="UV1 Offset" type="uint" />
@@ -2004,7 +2019,7 @@
         <member width="12" pos="44" mask="0xFFF00000000000" name="Vertex Attributes" type="VertexAttribute" />
     </bitfield>
 
-	<compound name="BSVertexData" versions="#SSE# #FO4#">
+	<compound name="BSVertexData" versions="#SSE# #FO4# #F76#">
 		<add name="Vertex" type="Vector3" cond="(#ARG# #BITAND# 0x401) == 0x401" />
 		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x411) == 0x411" />
 		<add name="Unused W" type="uint" cond="(#ARG# #BITAND# 0x411) == 0x401" />
@@ -3246,7 +3261,7 @@
 
     <niobject name="NiObjectNET" abstract="true" inherit="NiObject" module="NiMain">
         Abstract base class for NiObjects that support names, extra data, and time controllers.
-        <add name="Skyrim Shader Type" type="BSLightingShaderPropertyShaderType" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SKY#" onlyT="BSLightingShaderProperty">Configures the main shader path</add>
+        <add name="Shader Type" type="BSLightingShaderType" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SKY# #AND# #NI_BS_LTE_FO4#" onlyT="BSLightingShaderProperty">Configures the main shader path</add>
         <add name="Name" type="string">Name of this controllable object, used to refer to the object in .kf files.</add>
         <add name="Legacy Extra Data" type="LegacyExtraData" ver2="2.3" />
         <add name="Extra Data" type="Ref" template="NiExtraData" ver1="3.0" ver2="4.2.2.0">Extra data object index. (The first in a chain)</add>
@@ -3744,6 +3759,7 @@
             This causes massive inheritance problems so the rows below are doubled up to exclude NiParticleSystem for Bethesda Stream 100+
             and to add data exclusive to BSGeometry.
         <add name="Bounding Sphere" type="NiBound" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
+        <add name="Bound Min Max" type="float" arr1="6" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_F76#" onlyT="NiParticleSystem" />
         <add name="Skin" type="Ref" template="NiObject" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
         <add name="Data" type="Ref" template="NiGeometryData" vercond="#NI_BS_LT_SSE#">Data index (NiTriShapeData/NiTriStripData).</add>
         <add name="Data" type="Ref" template="NiGeometryData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</add>
@@ -3914,6 +3930,7 @@
     <niobject name="NiPSysData" inherit="NiParticlesData" module="NiParticle">
         Particle system data.
         <add name="Particle Info" type="NiParticleInfo" arr1="Num Vertices" vercond="!#BS202#" />
+        <add name="Unknown Vector" type="Vector3" vercond="#BS_F76#" />
         <add name="Has Rotation Speeds" type="bool" ver1="20.0.0.2" />
         <add name="Rotation Speeds" type="float" arr1="Num Vertices" cond="Has Rotation Speeds" ver1="20.0.0.2" vercond="!#BS202#" />
         <add name="Num Added Particles" type="ushort" vercond="!#BS202#" />
@@ -4752,6 +4769,8 @@
         Particle modifier that adds rotations to particles.
         <add name="Rotation Speed" type="float">Initial Rotation Speed in radians per second.</add>
         <add name="Rotation Speed Variation" type="float" ver1="20.0.0.2">Distributes rotation speed over the range [Speed - Variation, Speed + Variation].</add>
+        <add name="Unknown Vector" type="Vector4" vercond="#BS_F76#" />
+        <add name="Unknown Byte" type="byte" vercond="#BS_F76#" />
         <add name="Rotation Angle" type="float" ver1="20.0.0.2">Initial Rotation Angle in radians.</add>
         <add name="Rotation Angle Variation" type="float" ver1="20.0.0.2">Distributes rotation angle over the range [Angle - Variation, Angle + Variation].</add>
         <add name="Random Rot Speed Sign" type="bool" ver1="20.0.0.2">Randomly negate the initial rotation speed?</add>
@@ -6390,23 +6409,93 @@
         <option value="31" name="Refraction_Writes_Depth" />
     </bitflags>
 
+    <compound name="BSTextureArray" versions="#F76#">
+        <add name="Texture Array Width" type="uint" />
+        <add name="Texture Array" type="SizedString" arr1="Texture Array Width" />
+    </compound>
+
+    <enum name="BSShaderCRC32" storage="uint" prefix="SF" versions="#F76#">
+        <option name="CAST_SHADOWS" value="1563274220" />
+        <option name="ZBUFFER_TEST" value="1740048692" />
+        <option name="ZBUFFER_WRITE" value="3166356979" />
+        <option name="TWO_SIDED" value="759557230" />
+        <option name="VERTEXCOLORS" value="348504749" />
+        <option name="PBR" value="731263983" />
+        <option name="SKINNED" value="3744563888" />
+        <option name="ENVMAP" value="2893749418" />
+        <option name="VERTEX_ALPHA" value="2333069810" />
+        <option name="FACE" value="314919375" />
+        <option name="GRAYSCALE_TO_PALETTE_COLOR" value="442246519" />
+        <option name="DECAL" value="3849131744" />
+        <option name="DYNAMIC_DECAL" value="1576614759" />
+        <option name="HAIRTINT" value="1264105798" />
+        <option name="SKIN_TINT" value="1483897208" />
+        <option name="EMIT_ENABLED" value="2262553490" />
+        <option name="GLOWMAP" value="2399422528" />
+        <option name="REFRACTION" value="1957349758" />
+        <option name="REFRACTION_FALLOFF" value="902349195" />
+        <option name="NOFADE" value="2994043788" />
+        <option name="INVERTED_FADE_PATTERN" value="3030867718" />
+        <option name="RGB_FALLOFF" value="3448946507" />
+        <option name="EXTERNAL_EMITTANCE" value="2150459555" />
+        <option name="MODELSPACENORMALS" value="2548465567" />
+        <option name="TRANSFORM_CHANGED" value="3196772338" />
+        <option name="EFFECT_LIGHTING" value="3473438218" />
+        <option name="FALLOFF" value="3980660124" />
+        <option name="SOFT_EFFECT" value="3503164976" />
+        <option name="GRAYSCALE_TO_PALETTE_ALPHA" value="2901038324" />
+        <option name="WEAPON_BLOOD" value="2078326675" />
+        <option name="LOD_OBJECTS" value="2896726515" />
+    </enum>
+
+    <compound name="BSSPWetnessParams" module="BSMain" versions="#FO4# #F76#">
+        <add name="Spec Scale" type="float" default="-1.0" />
+        <add name="Spec Power" type="float" default="-1.0" />
+        <add name="Min Var" type="float" default="-1.0" />
+        <add name="Env Map Scale" type="float" default="-1.0" vercond="#BS_FO4#" />
+        <add name="Fresnel Power" type="float" default="-1.0" />
+        <add name="Metalness" type="float" default="-1.0" />
+        <add name="Unknown 1" type="float" default="-1.0" vercond="#BS_F76#" />
+        <add name="Unknown 2" type="float" default="-1.0" vercond="#BS_F76#" />
+    </compound>
+
+    <compound name="BSSPLuminanceParams" module="BSMain" versions="#F76#">
+        <add name="Lum Emittance" type="float" default="100.0" range="#F_POS#" />
+        <add name="Exposure Offset" type="float" default="13.5" range="#F_POS#" />
+        <add name="Final Exposure Min" type="float" default="2.0" range="#F_POS#" />
+        <add name="Final Exposure Max" type="float" default="3.0" range="#F_POS#" />
+    </compound>
+
+    <compound name="BSSPTranslucencyParams" module="BSMain" versions="#F76#">
+        <add name="Subsurface Color" type="Color3" />
+        <add name="Transmissive Scale" type="float"/>
+        <add name="Turbulence" type="float" />
+        <add name="Thick Object" type="bool" />
+        <add name="Mix Albedo" type="bool" />
+    </compound>
+
     <niobject name="BSLightingShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Bethesda shader property for Skyrim and later.
-        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="!#BS_FO4#" default="0x82400301">Skyrim Shader Flags for setting render/shader options.</add>
-        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="!#BS_FO4#" default="0x8021">Skyrim Shader Flags for setting render/shader options.</add>
+        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="#NI_BS_LT_FO4#" default="0x82400301">Skyrim Shader Flags for setting render/shader options.</add>
+        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="#NI_BS_LT_FO4#" default="0x8021">Skyrim Shader Flags for setting render/shader options.</add>
         <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" vercond="#BS_FO4#" default="0x80400201">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
         <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" vercond="#BS_FO4#" default="1">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
+        <add name="Shader Type" type="BSLightingShaderType155" vercond="#BS_F76#" />
+        <add name="Num SF1" type="uint" vercond="#BS_F76#" />
+        <add name="Num SF2" type="uint" vercond="#BS_F76#" />
+        <add name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
+        <add name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
         <add name="UV Offset" type="TexCoord">Offset UVs</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set, can have override in an esm/esp</add>
         <add name="Emissive Color" type="Color3" default="#VEC3_ZERO#">Glow color and alpha</add>
         <add name="Emissive Multiple" type="float" default="1.0" range="#F0_10#">Multiplied emissive colors</add>
-        <add name="Wet Material" type="NiFixedString" vercond="#BS_FO4#" />
+        <add name="Root Material" type="NiFixedString" vercond="#BS_GTE_FO4#" />
         <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T">How to handle texture borders.</add>
         <add name="Alpha" type="float" default="1.0" range="0.0:128.0">The material opacity (1=opaque). Greater than 1.0 is used to affect alpha falloff i.e. staying opaque longer based on vertex alpha and alpha mask.</add>
         <add name="Refraction Strength" type="float" range="#F0_1#">The amount of distortion. **Not based on physically accurate refractive index** (0=none)</add>
         <add name="Glossiness" type="float" default="80.0" range="#F0_999#" vercond="#NI_BS_LT_FO4#">The material specular power, or glossiness.</add>
-        <add name="Smoothness" type="float" default="1.0" range="#F0_1#" vercond="#BS_FO4#">The base roughness, multiplied by the smoothness map.</add>
+        <add name="Smoothness" type="float" default="1.0" range="#F0_1#" vercond="#BS_GTE_FO4#">The base roughness, multiplied by the smoothness map.</add>
         <add name="Specular Color" type="Color3" default="#VEC3_ONE#">Adds a colored highlight.</add>
         <add name="Specular Strength" type="float" default="1.0" range="#F0_10#">Brightness of specular highlight. (0=not visible)</add>
         <add name="Lighting Effect 1" type="float" default="0.3" range="#F0_10#" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
@@ -6414,38 +6503,45 @@
         <add name="Subsurface Rolloff" type="float" default="0.0" range="#F0_10#" vercond="#BS_FO4#" />
         <add name="Rimlight Power" type="float" default="#FLT_MAX#" vercond="#BS_FO4#" />
         <add name="Backlight Power" type="float" range="#F0_1000#" cond="Rimlight Power == 0x7F7FFFFF" vercond="#BS_FO4#" />
-        <add name="Grayscale to Palette Scale" type="float" default="1.0" range="#F0_1#" vercond="#BS_FO4#" />
-        <add name="Fresnel Power" type="float" default="5.0" range="#F_PNZ#" vercond="#BS_FO4#" />
-        <add name="Wetness Spec Scale" type="float" default="-1.0" vercond="#BS_FO4#" />
-        <add name="Wetness Spec Power" type="float" default="-1.0" vercond="#BS_FO4#" />
-        <add name="Wetness Min Var" type="float" default="-1.0" vercond="#BS_FO4#" />
-        <add name="Wetness Env Map Scale" type="float" default="-1.0" vercond="#BS_FO4#" />
-        <add name="Wetness Fresnel Power" type="float" default="-1.0" vercond="#BS_FO4#" />
-        <add name="Wetness Metalness" type="float" default="-1.0" vercond="#BS_FO4#" />
-        <add name="Environment Map Scale" type="float" default="1.0" range="#F0_10#" cond="Skyrim Shader Type == 1">Scales the intensity of the environment/cube map.</add>
-        <add name="Use Screen Space Reflections" type="bool" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
-        <add name="Wetness Control: Use SSR" type="bool" cond="Skyrim Shader Type == 1" vercond="#BS_FO4#" />
-        <add name="Skin Tint Color" type="Color3" default="#VEC3_ONE#" cond="Skyrim Shader Type == 5">Tints the base texture. Overridden by game settings.</add>
-        <add name="Skin Tint Alpha" type="float" default="1.0" cond="Skyrim Shader Type == 5" vercond="#BS_FO4#" />
-        <add name="Hair Tint Color" type="Color3" default="#VEC3_ONE#" cond="Skyrim Shader Type == 6">Tints the base texture. Overridden by game settings.</add>
-        <add name="Max Passes" type="float" default="4.0" range="1.0:320.0" cond="Skyrim Shader Type == 7" />
-        <add name="Scale" type="float" default="1.0" range="#F0_10#" cond="Skyrim Shader Type == 7" />
-        <add name="Parallax Inner Layer Thickness" type="float" default="5.0" range="5.0:500.0" cond="Skyrim Shader Type == 11">How far from the surface the inner layer appears to be.</add>
-        <add name="Parallax Refraction Scale" type="float" default="0.25" range="#F0_1#" cond="Skyrim Shader Type == 11">Depth of inner parallax layer effect.</add>
-        <add name="Parallax Inner Layer Texture Scale" type="TexCoord" cond="Skyrim Shader Type == 11">Scales the inner parallax layer texture.</add>
-        <add name="Parallax Envmap Strength" type="float" default="1.0" range="#F0_10#" cond="Skyrim Shader Type == 11">How strong the environment/cube map is.</add>
-        <add name="Sparkle Parameters" type="Vector4" cond="Skyrim Shader Type == 14">CK lists "snow material" when used.</add>
-        <add name="Eye Cubemap Scale" type="float" default="1.3" range="#F0_10#" cond="Skyrim Shader Type == 16">Eye cubemap scale</add>
-        <add name="Left Eye Reflection Center" type="Vector3" cond="Skyrim Shader Type == 16">Offset to set center for left eye cubemap</add>
-        <add name="Right Eye Reflection Center" type="Vector3" cond="Skyrim Shader Type == 16">Offset to set center for right eye cubemap</add>
+        <add name="Grayscale to Palette Scale" type="float" default="1.0" range="#F0_1#" vercond="#BS_GTE_FO4#" />
+        <add name="Fresnel Power" type="float" default="5.0" range="#F_PNZ#" vercond="#BS_GTE_FO4#" />
+        <add name="Wetness" type="BSSPWetnessParams" vercond="#BS_GTE_FO4#" />
+        <add name="Luminance" type="BSSPLuminanceParams" vercond="#BS_F76#" />
+        <add name="Do Translucency" type="bool" vercond="#BS_F76#" />
+        <add name="Translucency" type="BSSPTranslucencyParams" vercond="#BS_F76#" cond="Do Translucency" />
+        <add name="Has Texture Arrays" type="byte" vercond="#BS_F76#" />
+        <add name="Num Texture Arrays" type="uint" vercond="#BS_F76#" cond="Has Texture Arrays" />
+        <add name="Texture Arrays" type="BSTextureArray" arr1="Num Texture Arrays" vercond="#BS_F76#" cond="Has Texture Arrays" />
+        <add name="Environment Map Scale" type="float" default="1.0" range="#F0_10#" cond="Shader Type == 1" vercond="#NI_BS_LTE_FO4#">Scales the intensity of the environment/cube map.</add>
+        <add name="Use Screen Space Reflections" type="bool" cond="Shader Type == 1" vercond="#BS_FO4#" />
+        <add name="Wetness Control: Use SSR" type="bool" cond="Shader Type == 1" vercond="#BS_FO4#" />
+        <add name="Skin Tint Color" type="Color4" vercond="#BS_F76#" cond="Shader Type == 4" />
+        <add name="Hair Tint Color" type="Color3" vercond="#BS_F76#" cond="Shader Type == 5" />
+        <add name="Skin Tint Color" type="Color3" default="#VEC3_ONE#" vercond="#NI_BS_LTE_FO4#" cond="Shader Type == 5">Tints the base texture. Overridden by game settings.</add>
+        <add name="Skin Tint Alpha" type="float" default="1.0" vercond="#BS_FO4#" cond="Shader Type == 5" />
+        <add name="Hair Tint Color" type="Color3" default="#VEC3_ONE#" vercond="#NI_BS_LTE_FO4#" cond="Shader Type == 6">Tints the base texture. Overridden by game settings.</add>
+        <add name="Max Passes" type="float" default="4.0" range="1.0:320.0" cond="Shader Type == 7" />
+        <add name="Scale" type="float" default="1.0" range="#F0_10#" cond="Shader Type == 7" />
+        <add name="Parallax Inner Layer Thickness" type="float" default="5.0" range="5.0:500.0" cond="Shader Type == 11">How far from the surface the inner layer appears to be.</add>
+        <add name="Parallax Refraction Scale" type="float" default="0.25" range="#F0_1#" cond="Shader Type == 11">Depth of inner parallax layer effect.</add>
+        <add name="Parallax Inner Layer Texture Scale" type="TexCoord" cond="Shader Type == 11">Scales the inner parallax layer texture.</add>
+        <add name="Parallax Envmap Strength" type="float" default="1.0" range="#F0_10#" cond="Shader Type == 11">How strong the environment/cube map is.</add>
+        <add name="Sparkle Parameters" type="Vector4" cond="Shader Type == 14">CK lists "snow material" when used.</add>
+        <add name="Eye Cubemap Scale" type="float" default="1.3" range="#F0_10#" cond="Shader Type == 16">Eye cubemap scale</add>
+        <add name="Left Eye Reflection Center" type="Vector3" cond="Shader Type == 16">Offset to set center for left eye cubemap</add>
+        <add name="Right Eye Reflection Center" type="Vector3" cond="Shader Type == 16">Offset to set center for right eye cubemap</add>
     </niobject>
 
     <niobject name="BSEffectShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Bethesda effect shader property for Skyrim and later.
-        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="0x80000000" vercond="!#BS_FO4#" />
-        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="0x20" vercond="!#BS_FO4#" />
+        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="0x80000000" vercond="#NI_BS_LT_FO4#" />
+        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="0x20" vercond="#NI_BS_LT_FO4#" />
         <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" default="0x80000000" vercond="#BS_FO4#" />
         <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" default="0x20" vercond="#BS_FO4#" />
+        <add name="Num SF1" type="uint" vercond="#BS_F76#" />
+        <add name="Num SF2" type="uint" vercond="#BS_F76#" />
+        <add name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
+        <add name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
         <add name="UV Offset" type="TexCoord">Offset UVs</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures</add>
         <add name="Source Texture"  type="SizedString">points to an external texture.</add>
@@ -6458,14 +6554,20 @@
         <add name="Falloff Stop Angle" type="float" default="1.0" range="#F_NRM#">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
         <add name="Falloff Start Opacity" type="float" range="#F0_1#">Alpha falloff multiplier at start angle</add>
         <add name="Falloff Stop Opacity" type="float" range="#F0_1#">Alpha falloff multiplier at end angle</add>
-        <add name="Emissive Color" type="Color4" default="#VEC4_ONE#">Emissive color</add>
-        <add name="Emissive Multiple" type="float" default="1.0" range="0.0:360.0">Multiplier for Emissive Color (RGB part)</add>
+        <add name="Refraction Power" type="float" vercond="#BS_F76#" />
+        <add name="Base Color" type="Color4" default="#VEC4_ONE#">Base color</add>
+        <add name="Base Color Scale" type="float" default="1.0" range="0.0:360.0">Multiplier for Base Color (RGB part)</add>
         <add name="Soft Falloff Depth" type="float" default="100.0" range="0.0:9999.0" />
         <add name="Greyscale Texture"  type="SizedString">Points to an external texture, used as palette for SLSF1_Greyscale_To_PaletteColor/SLSF1_Greyscale_To_PaletteAlpha.</add>
-        <add name="Env Map Texture" type="SizedString" vercond="#BS_FO4#" />
-        <add name="Normal Texture" type="SizedString" vercond="#BS_FO4#" />
-        <add name="Env Mask Texture" type="SizedString" vercond="#BS_FO4#" />
-        <add name="Environment Map Scale" type="float" default="1.0" range="0.01:20.0" vercond="#BS_FO4#" />
+        <add name="Env Map Texture" type="SizedString" vercond="#BS_GTE_FO4#" />
+        <add name="Normal Texture" type="SizedString" vercond="#BS_GTE_FO4#" />
+        <add name="Env Mask Texture" type="SizedString" vercond="#BS_GTE_FO4#" />
+        <add name="Environment Map Scale" type="float" default="1.0" range="0.01:20.0" vercond="#BS_GTE_FO4#" />
+        <add name="Reflectance Texture" type="SizedString" vercond="#BS_F76#" />
+        <add name="Lighting Texture" type="SizedString" vercond="#BS_F76#" />
+        <add name="Emittance Color" type="Color3" vercond="#BS_F76#" />
+        <add name="Emit Gradient Texture" type="SizedString" vercond="#BS_F76#" />
+        <add name="Luminance" type="BSSPLuminanceParams" vercond="#BS_F76#" />
     </niobject>
     
     <bitflags name="WaterShaderPropertyFlags" storage="uint" prefix="BSWSP" versions="#SKY_AND_LATER#">
@@ -6488,8 +6590,12 @@
     
     <niobject name="BSWaterShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Skyrim water shader property, different from "WaterShaderProperty" seen in Fallout.
-        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000008" />
-        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" />
+        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000008" vercond="!#BS_F76#" />
+        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" vercond="!#BS_F76#" />
+        <add name="Num SF1" type="uint" vercond="#BS_F76#" />
+        <add name="Num SF2" type="uint" vercond="#BS_F76#" />
+        <add name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
+        <add name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
         <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Water Shader Flags" type="WaterShaderPropertyFlags" default="0xC4" />
@@ -6497,8 +6603,12 @@
     
     <niobject name="BSSkyShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Skyrim Sky shader block.
-        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000000" />
-        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" />
+        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000000" vercond="!#BS_F76#" />
+        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" vercond="!#BS_F76#" />
+        <add name="Num SF1" type="uint" vercond="#BS_F76#" />
+        <add name="Num SF2" type="uint" vercond="#BS_F76#" />
+        <add name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
+        <add name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
         <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
         <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
         <add name="Source Texture" type="SizedString">points to an external texture.</add>
@@ -6526,6 +6636,7 @@
         <add name="Color 2 End Percent" type="float" range="#F0_1#" />
         <add name="Color 2 Start Percent" type="float" default="1.0" range="#F0_1#" />
         <add name="Colors" type="Color4" arr1="3" />
+        <add name="Unknown Shorts" type="ushort" arr1="26" vercond="#BS_F76#" />
     </niobject>
 
 
@@ -6734,9 +6845,9 @@
         <add name="Flags" type="byte" vercond="#NI_BS_LT_FO4#" />
         <add name="Start Index" type="uint">Index = previous Index + previous Num Tris in Segment * 3</add>
         <add name="Num Primitives" type="uint">The number of triangles belonging to this segment</add>
-        <add name="Parent Array Index" type="uint" vercond="#BS_FO4#" />
-        <add name="Num Sub Segments" type="uint" vercond="#BS_FO4#" />
-        <add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="#BS_FO4#" />
+        <add name="Parent Array Index" type="uint" vercond="#BS_GTE_FO4#" />
+        <add name="Num Sub Segments" type="uint" vercond="#BS_GTE_FO4#" />
+        <add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="#BS_GTE_FO4#" />
     </compound>
 
     <niobject name="BSSegmentedTriShape" inherit="NiTriShape" module="BSMain" versions="#FO3_AND_LATER#">
@@ -7999,18 +8110,19 @@
     
     <!-- Fallout 4 Geometry -->
     
-    <niobject name="BSTriShape" inherit="NiAVObject" module="BSMain" versions="#SSE# #FO4#">
+    <niobject name="BSTriShape" inherit="NiAVObject" module="BSMain" versions="#SSE# #FO4# #F76#">
         Fallout 4 Tri Shape
         <add name="Bounding Sphere" type="NiBound" />
+        <add name="Bound Min Max" type="float" arr1="6" vercond="#BS_F76#" />
         <add name="Skin" type="Ref" template="NiObject" />
         <add name="Shader Property" type="Ref" template="BSShaderProperty" />
         <add name="Alpha Property" type="Ref" template="NiAlphaProperty" />
         <add name="Vertex Desc" type="BSVertexDesc" />
-        <add name="Num Triangles" type="uint" vercond="#BS_FO4#" />
+        <add name="Num Triangles" type="uint" vercond="#BS_GTE_FO4#" />
         <add name="Num Triangles" type="ushort" vercond="#NI_BS_LT_FO4#" />
         <add name="Num Vertices" type="ushort" />
         <add name="Data Size" type="uint" calc="((Vertex Desc #BITAND# 0xF) #MUL# Num Vertices #MUL# 4) #ADD# (Num Triangles #MUL# 6)" />
-        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc #RSH# 44" cond="Data Size #GT# 0" vercond="#BS_FO4#" />
+        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc #RSH# 44" cond="Data Size #GT# 0" vercond="#BS_GTE_FO4#" />
         <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc #RSH# 44" cond="Data Size #GT# 0" vercond="#BS_SSE#" />
         <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size #GT# 0" />
         <add name="Particle Data Size" type="uint" calc="(Num Vertices #MUL# 6) #ADD# (Num Triangles #MUL# 3)" vercond="#BS_SSE#" />
@@ -8026,14 +8138,14 @@
         <add name="LOD2 Size" type="uint" />
     </niobject>
     
-    <compound name="BSGeometryPerSegmentSharedData" size="16" versions="#FO4#">
+    <compound name="BSGeometryPerSegmentSharedData" size="16" versions="#FO4# #F76#">
         <add name="User Index" type="uint">If Bone ID is 0xffffffff, this value refers to the Segment at the listed index. Otherwise this is the "Biped Object", which is like the body part types in Skyrim and earlier.</add>
         <add name="Bone ID" type="uint" default="#UINT_MAX#">A hash of the bone name string.</add>
         <add name="Num Cut Offsets" type="uint" range="0:8">Maximum of 8.</add>
         <add name="Cut Offsets" type="float" arr1="Num Cut Offsets" />
     </compound>
 
-    <compound name="BSGeometrySegmentSharedData" versions="#FO4#">
+    <compound name="BSGeometrySegmentSharedData" versions="#FO4# #F76#">
         <add name="Num Segments" type="uint" />
         <add name="Total Segments" type="uint" />
         <add name="Segment Starts" type="uint" arr1="Num Segments" />
@@ -8041,24 +8153,24 @@
         <add name="SSF File" type="SizedString16" />
     </compound>
 
-    <niobject name="BSSubIndexTriShape" inherit="BSTriShape" module="BSMain" versions="#SSE# #FO4#">
+    <niobject name="BSSubIndexTriShape" inherit="BSTriShape" module="BSMain" versions="#SSE# #FO4# #F76#">
         Fallout 4 Sub-Index Tri Shape
-		<add name="Num Primitives" type="uint" calc="#LEN[Triangles]#" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
-		<add name="Num Segments" type="uint" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
-		<add name="Total Segments" type="uint" vercond="#BS_FO4#" cond="Data Size #GT# 0" />
-		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_FO4#" arr1="Num Segments" cond="Data Size #GT# 0" />
-		<add name="Segment Data" type="BSGeometrySegmentSharedData" vercond="#BS_FO4#" cond="(Num Segments #LT# Total Segments) #AND# (Data Size #GT# 0)" />
+		<add name="Num Primitives" type="uint" calc="#LEN[Triangles]#" vercond="#BS_GTE_FO4#" cond="Data Size #GT# 0" />
+		<add name="Num Segments" type="uint" vercond="#BS_GTE_FO4#" cond="Data Size #GT# 0" />
+		<add name="Total Segments" type="uint" vercond="#BS_GTE_FO4#" cond="Data Size #GT# 0" />
+		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_GTE_FO4#" arr1="Num Segments" cond="Data Size #GT# 0" />
+		<add name="Segment Data" type="BSGeometrySegmentSharedData" vercond="#BS_GTE_FO4#" cond="(Num Segments #LT# Total Segments) #AND# (Data Size #GT# 0)" />
 		<add name="Num Segments" type="uint" vercond="#BS_SSE#" />
 		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_SSE#" arr1="Num Segments" />
     </niobject>
     
     <!-- Fallout 4 Physics -->
 
-    <niobject name="bhkSystem" abstract="true" inherit="NiObject" module="BSHavok" versions="#FO4#">
+    <niobject name="bhkSystem" abstract="true" inherit="NiObject" module="BSHavok" versions="#FO4# #F76#">
         Fallout 4 Physics System
     </niobject>
 
-    <niobject name="bhkNPCollisionObject" inherit="NiCollisionObject" module="BSHavok" versions="#FO4#">
+    <niobject name="bhkNPCollisionObject" inherit="NiCollisionObject" module="BSHavok" versions="#FO4# #F76#">
         Fallout 4 Collision Object
         <add name="Flags" type="bhkCOFlags" default="0x80">
             Note: The CK Preview scenegraph reports these bits incorrectly.
@@ -8067,28 +8179,28 @@
         <add name="Body ID" type="uint" />
     </niobject>
     
-    <niobject name="bhkPhysicsSystem" inherit="bhkSystem" module="BSHavok" versions="#FO4#">
+    <niobject name="bhkPhysicsSystem" inherit="bhkSystem" module="BSHavok" versions="#FO4# #F76#">
         Fallout 4 Collision System
         <add name="Binary Data" type="ByteArray" />
     </niobject>
 
-    <niobject name="bhkRagdollSystem" inherit="bhkSystem" module="BSHavok" versions="#FO4#">
+    <niobject name="bhkRagdollSystem" inherit="bhkSystem" module="BSHavok" versions="#FO4# #F76#">
         Fallout 4 Ragdoll System
         <add name="Binary Data" type="ByteArray" />
     </niobject>
 
-    <niobject name="BSExtraData" inherit="NiExtraData" module="BSMain" versions="#FO4#">
+    <niobject name="BSExtraData" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Extra Data
     </niobject>
 
-    <niobject name="BSClothExtraData" inherit="BSExtraData" module="BSMain" versions="#FO4#">
+    <niobject name="BSClothExtraData" inherit="BSExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Cloth data
         <add name="Binary Data" type="ByteArray" />
     </niobject>
     
     <!-- Fallout 4 Skeleton -->
 
-    <compound name="BSSkinBoneTrans" size="68" versions="#FO4#">
+    <compound name="BSSkinBoneTrans" size="68" versions="#FO4# #F76#">
         Fallout 4 Bone Transform
         <add name="Bounding Sphere" type="NiBound" />
         <add name="Rotation" type="Matrix33" />
@@ -8096,7 +8208,7 @@
         <add name="Scale" type="float" />
     </compound>
 
-    <niobject name="BSSkin::Instance" inherit="NiObject" module="BSMain" versions="#FO4#">
+    <niobject name="BSSkin::Instance" inherit="NiObject" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Skin Instance
         <add name="Skeleton Root" type="Ptr" template="NiAVObject" />
         <add name="Data" type="Ref" template="BSSkin::BoneData" />
@@ -8106,19 +8218,19 @@
         <add name="Scales" type="Vector3" arr1="Num Scales" />
     </niobject>
 
-    <niobject name="BSSkin::BoneData" inherit="NiObject" module="BSMain" versions="#FO4#">
+    <niobject name="BSSkin::BoneData" inherit="NiObject" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Bone Data
         <add name="Num Bones" type="uint" />
         <add name="Bone List" type="BSSkinBoneTrans" arr1="Num Bones" />
     </niobject>
 
-    <niobject name="BSPositionData" inherit="NiExtraData" module="BSMain" versions="#FO4#">
+    <niobject name="BSPositionData" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Positional Data
         <add name="Num Data" type="uint" />
         <add name="Data" type="hfloat" arr1="Num Data" />
     </niobject>
 
-    <compound name="BSConnectPoint" versions="#FO4#">
+    <compound name="BSConnectPoint" versions="#FO4# #F76#">
         <add name="Parent" type="SizedString" default="WorkshopConnectPoints" />
         <add name="Name" type="SizedString" />
         <add name="Rotation" type="Quaternion" />
@@ -8126,32 +8238,32 @@
         <add name="Scale" type="float" default="1.0" />
     </compound>
 
-    <niobject name="BSConnectPoint::Parents" inherit="NiExtraData" module="BSMain" versions="#FO4#">
+    <niobject name="BSConnectPoint::Parents" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Item Slot Parent
         <add name="Num Connect Points" type="uint" default="1" />
         <add name="Connect Points" type="BSConnectPoint" arr1="Num Connect Points" />
     </niobject>
 
-    <niobject name="BSConnectPoint::Children" inherit="NiExtraData" module="BSMain" versions="#FO4#">
+    <niobject name="BSConnectPoint::Children" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Item Slot Child
         <add name="Skinned" type="bool" />
         <add name="Num Points" type="uint" default="1" />
         <add name="Point Name" type="SizedString" arr1="Num Points" />
     </niobject>
     
-    <niobject name="BSEyeCenterExtraData" inherit="NiExtraData" module="BSMain" versions="#FO4#">
+    <niobject name="BSEyeCenterExtraData" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Eye Center Data
         <add name="Num Data" type="uint" />
         <add name="Data" type="float" arr1="Num Data" />
     </niobject>
 	
-    <compound name="BSPackedGeomDataCombined" size="72" versions="#FO4#">
+    <compound name="BSPackedGeomDataCombined" size="72" versions="#FO4# #F76#">
         <add name="Grayscale to Palette Scale" type="float" />
         <add name="Transform" type="NiTransform" />
         <add name="Bounding Sphere" type="NiBound" />
     </compound>
 
-    <compound name="BSPackedGeomData" versions="#FO4#">
+    <compound name="BSPackedGeomData" versions="#FO4# #F76#">
         <add name="Num Verts" type="uint" />
         <add name="LOD Levels" type="uint" />
         <add name="Tri Count LOD0" type="uint" />
@@ -8167,7 +8279,7 @@
         <add name="Triangles" type="Triangle" arr1="Tri Count LOD0 + Tri Count LOD1 + Tri Count LOD2" />
     </compound>
 
-    <compound name="BSPackedSharedGeomData" versions="#FO4#">
+    <compound name="BSPackedSharedGeomData" versions="#FO4# #F76#">
         <add name="Num Verts" type="uint" />
         <add name="LOD Levels" type="uint" />
         <add name="Tri Count LOD0" type="uint" />
@@ -8181,13 +8293,13 @@
         <add name="Vertex Desc" type="BSVertexDesc" />
     </compound>
 
-    <compound name="BSPackedGeomObject" size="8" versions="#FO4#">
+    <compound name="BSPackedGeomObject" size="8" versions="#FO4# #F76#">
         This is the data necessary to access the shared geometry in a PSG/CSG file.
         <add name="Filename Hash" type="uint">BSCRC32 of the filename without the PSG/CSG extension.</add>
         <add name="Data Offset" type="uint">Offset of the geometry data in the PSG/CSG file.</add>
     </compound>
 
-    <niobject name="BSPackedCombinedGeomDataExtra" inherit="NiExtraData" module="BSMain" versions="#FO4#">
+    <niobject name="BSPackedCombinedGeomDataExtra" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Packed Combined Geometry Data.
         Geometry is baked into the file and given a list of transforms to position each copy.
         <add name="Vertex Desc" type="BSVertexDesc" />
@@ -8199,7 +8311,7 @@
         <add name="Object Data" type="BSPackedGeomData" arr1="Num Data" />
     </niobject>
 
-    <niobject name="BSPackedCombinedSharedGeomDataExtra" inherit="NiExtraData" module="BSMain" versions="#FO4#">
+    <niobject name="BSPackedCombinedSharedGeomDataExtra" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Packed Combined Shared Geometry Data.
         Geometry is NOT baked into the file. It is instead a reference to the geometry via a CSG filename hash and data offset.
         <add name="Vertex Desc" type="BSVertexDesc" />
@@ -8214,7 +8326,7 @@
 
     <!-- Fallout 4 Animation -->
     
-    <niobject name="NiLightRadiusController" inherit="NiFloatInterpController" module="BSAnimation" versions="#FO4#">
+    <niobject name="NiLightRadiusController" inherit="NiFloatInterpController" module="BSAnimation" versions="#FO4# #F76#">
     
     </niobject>
 	
@@ -8229,5 +8341,30 @@
         Large ref flag.
 		<add name="Large Ref" type="bool" />
 	</niobject>
-	
+
+    <niobject name="BSDistantObjectExtraData" inherit="NiExtraData" module="BSMain" versions="#F76#">
+        Distant Object flags.
+        <add name="Distant Object Flags" type="uint" />
+    </niobject>
+
+    <compound name="BSDistantObjectInstance" module="BSMain" versions="#F76#">
+        <add name="Unknown Bytes 1" type="byte" arr1="12" />
+        <add name="Num Unknown 1" type="uint" />
+        <add name="Unknown Ints 1" type="uint" arr1="3 #MUL# Num Unknown 1" />
+        <add name="Num Unknown 2" type="uint" />
+        <add name="Unknown Bytes 2" type="byte" binary="true" arr1="64 #MUL# Num Unknown 2" />
+    </compound>
+
+    <compound name="BSDistantObjectTextureArray" module="BSMain" versions="#F76#">
+        <add name="Unknown Byte" type="byte" default="1" />
+        <add name="Num Texture Arrays" type="uint" />
+        <add name="Texture Arrays" type="BSTextureArray" arr1="Num Texture Arrays" />
+    </compound>
+
+    <niobject name="BSDistantObjectInstancedNode" inherit="BSMultiBoundNode" module="BSMain" versions="#F76#">
+        <add name="Num Instances" type="uint" />
+        <add name="Instances" type="BSDistantObjectInstance" arr1="Num Instances" />
+        <add name="Texture Arrays" type="BSDistantObjectTextureArray" arr1="3" />
+    </niobject>
+
 </niftoolsxml>

From 7b15bfe4f6ea4fdaf03c2b07a52bb62cb8976728 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 23 Apr 2019 07:03:02 -0400
Subject: [PATCH 83/86] Rename value to bit for bitflags

So that "value" can be used for bit patterns (collections of individual bits).
---
 nif.xml | 666 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 333 insertions(+), 333 deletions(-)

diff --git a/nif.xml b/nif.xml
index 70d3d92..ccb27a9 100644
--- a/nif.xml
+++ b/nif.xml
@@ -323,16 +323,16 @@
 
     <bitflags name="AccumFlags" storage="uint">
         Describes the options for the accum root on NiControllerSequence.
-        <option value="0" name="ACCUM_X_TRANS">X Translation will be accumulated.</option>
-        <option value="1" name="ACCUM_Y_TRANS">Y Translation will be accumulated.</option>
-        <option value="2" name="ACCUM_Z_TRANS">Z Translation will be accumulated.</option>
-        <option value="3" name="ACCUM_X_ROT">X Rotation will be accumulated.</option>
-        <option value="4" name="ACCUM_Y_ROT">Y Rotation will be accumulated.</option>
-        <option value="5" name="ACCUM_Z_ROT">Z Rotation will be accumulated.</option>
-        <option value="6" name="ACCUM_X_FRONT">+X is front facing. (Default)</option>
-        <option value="7" name="ACCUM_Y_FRONT">+Y is front facing.</option>
-        <option value="8" name="ACCUM_Z_FRONT">+Z is front facing.</option>
-        <option value="9" name="ACCUM_NEG_FRONT">-X is front facing.</option>
+        <option bit="0" name="ACCUM_X_TRANS">X Translation will be accumulated.</option>
+        <option bit="1" name="ACCUM_Y_TRANS">Y Translation will be accumulated.</option>
+        <option bit="2" name="ACCUM_Z_TRANS">Z Translation will be accumulated.</option>
+        <option bit="3" name="ACCUM_X_ROT">X Rotation will be accumulated.</option>
+        <option bit="4" name="ACCUM_Y_ROT">Y Rotation will be accumulated.</option>
+        <option bit="5" name="ACCUM_Z_ROT">Z Rotation will be accumulated.</option>
+        <option bit="6" name="ACCUM_X_FRONT">+X is front facing. (Default)</option>
+        <option bit="7" name="ACCUM_Y_FRONT">+Y is front facing.</option>
+        <option bit="8" name="ACCUM_Z_FRONT">+Z is front facing.</option>
+        <option bit="9" name="ACCUM_NEG_FRONT">-X is front facing.</option>
     </bitflags>
 
     <enum name="ApplyMode" storage="uint">
@@ -1991,17 +1991,17 @@
 
     <bitflags name="VertexAttribute" storage="ushort" prefix="VF" versions="#SSE# #FO4# #F76#">
         The bits of BSVertexDesc that describe the enabled vertex attributes.
-        <option value="1" name="Vertex" />
-        <option value="2" name="UVs" />
-        <option value="3" name="UVs_2" />
-        <option value="4" name="Normals" />
-        <option value="5" name="Tangents" />
-        <option value="6" name="Vertex_Colors" />
-        <option value="7" name="Skinned" />
-        <option value="8" name="Land_Data" />
-        <option value="9" name="Eye_Data" />
-        <option value="10" name="Instance" />
-        <option value="11" name="Full_Precision" />
+        <option bit="1" name="Vertex" />
+        <option bit="2" name="UVs" />
+        <option bit="3" name="UVs_2" />
+        <option bit="4" name="Normals" />
+        <option bit="5" name="Tangents" />
+        <option bit="6" name="Vertex_Colors" />
+        <option bit="7" name="Skinned" />
+        <option bit="8" name="Land_Data" />
+        <option bit="9" name="Eye_Data" />
+        <option bit="10" name="Instance" />
+        <option bit="11" name="Full_Precision" />
     </bitflags>
 
     <bitfield name="BSVertexDesc" storage="uint64" versions="#SSE# #FO4# #F76#">
@@ -2125,11 +2125,11 @@
 
 	<bitflags name="FurnitureEntryPoints" storage="ushort" versions="#BETHESDA#">
 		Bethesda Animation. Furniture entry points. It specifies the direction(s) from where the actor is able to enter (and leave) the position.
-		<option value="0" name="Front">front entry point</option>
-		<option value="1" name="Behind">behind entry point</option>
-		<option value="2" name="Right">right entry point</option>
-		<option value="3" name="Left">left entry point</option>
-		<option value="4" name="Up">up entry point - unknown function. Used on some beds in Skyrim, probably for blocking of sleeping position.</option>
+		<option bit="0" name="Front">front entry point</option>
+		<option bit="1" name="Behind">behind entry point</option>
+		<option bit="2" name="Right">right entry point</option>
+		<option bit="3" name="Left">left entry point</option>
+		<option bit="4" name="Up">up entry point - unknown function. Used on some beds in Skyrim, probably for blocking of sleeping position.</option>
 	</bitflags>
 
 	<enum name="AnimationType" storage="ushort" versions="#BETHESDA#">
@@ -2491,8 +2491,8 @@
 
     <bitflags name="BSPartFlag" storage="ushort" versions="#BETHESDA#">
         Editor flags for the Body Partitions. 
-        <option value="0" name="PF_EDITOR_VISIBLE">Visible in Editor</option>
-        <option value="8" name="PF_START_NET_BONESET">Start a new shared boneset.  It is expected this BoneSet and the following sets in the Skin Partition will have the same bones.</option>
+        <option bit="0" name="PF_EDITOR_VISIBLE">Visible in Editor</option>
+        <option bit="8" name="PF_START_NET_BONESET">Start a new shared boneset.  It is expected this BoneSet and the following sets in the Skin Partition will have the same bones.</option>
     </bitflags>
 
     <compound name="BodyPartList" size="4" versions="#BETHESDA#">
@@ -3163,13 +3163,13 @@
     </niobject>
 
     <bitflags name="PathFlags" storage="ushort" prefix="NIPI">
-        <option value="0" name="CVDataNeedsUpdate" />
-        <option value="1" name="CurveTypeOpen" />
-        <option value="2" name="AllowFlip" />
-        <option value="3" name="Bank" />
-        <option value="4" name="ConstantVelocity" />
-        <option value="5" name="Follow" />
-        <option value="6" name="Flip" />
+        <option bit="0" name="CVDataNeedsUpdate" />
+        <option bit="1" name="CurveTypeOpen" />
+        <option bit="2" name="AllowFlip" />
+        <option bit="3" name="Bank" />
+        <option bit="4" name="ConstantVelocity" />
+        <option bit="5" name="Follow" />
+        <option bit="6" name="Flip" />
     </bitflags>
 
     <niobject name="NiPathInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
@@ -3289,18 +3289,18 @@
     <bitflags name="bhkCOFlags" storage="ushort" prefix="BHKCO" versions="#BETHESDA#">
         bhkNiCollisionObject flags.
         0x100 and 0x200 are only for bhkBlendCollisionObject
-        <option value="0" name="ACTIVE" />
-        <option value="1" name="RESET_TRANS" />
-        <option value="2" name="NOTIFY" />
-        <option value="3" name="SET_LOCAL" />
-        <option value="4" name="DBG_DISPLAY" />
-        <option value="5" name="USE_VEL" />
-        <option value="6" name="RESET" />
-        <option value="7" name="SYNC_ON_UPDATE" />
-        <option value="8" name="BLEND_POS" />
-        <option value="9" name="ALWAYS_BLEND" />
-        <option value="10" name="ANIM_TARGETED" />
-        <option value="11" name="DISMEMBERED_LIMB" />
+        <option bit="0" name="ACTIVE" />
+        <option bit="1" name="RESET_TRANS" />
+        <option bit="2" name="NOTIFY" />
+        <option bit="3" name="SET_LOCAL" />
+        <option bit="4" name="DBG_DISPLAY" />
+        <option bit="5" name="USE_VEL" />
+        <option bit="6" name="RESET" />
+        <option bit="7" name="SYNC_ON_UPDATE" />
+        <option bit="8" name="BLEND_POS" />
+        <option bit="9" name="ALWAYS_BLEND" />
+        <option bit="10" name="ANIM_TARGETED" />
+        <option bit="11" name="DISMEMBERED_LIMB" />
     </bitflags>
 
     <niobject name="bhkNiCollisionObject" abstract="true" inherit="NiCollisionObject" module="BSHavok">
@@ -3884,9 +3884,9 @@
     </niobject>
 
     <bitflags name="AspectFlags" storage="ushort" versions="#FO3_AND_LATER#">
-        <option value="0" name="Velocity Orientation" />
-        <option value="1" name="Initial Rotation from Velocity" />
-        <option value="8" name="Speed to Aspect Enabled" />
+        <option bit="0" name="Velocity Orientation" />
+        <option bit="1" name="Initial Rotation from Velocity" />
+        <option bit="8" name="Speed to Aspect Enabled" />
     </bitflags>
 
     <niobject name="NiParticlesData" inherit="NiGeometryData" module="NiMain">
@@ -4235,9 +4235,9 @@
     </niobject>
 
     <bitflags name="LookAtFlags" storage="ushort">
-        <option value="0" name="LOOK_FLIP">Flip</option>
-        <option value="1" name="LOOK_Y_AXIS">Y-Axis</option>
-        <option value="2" name="LOOK_Z_AXIS">Z-Axis</option>
+        <option bit="0" name="LOOK_FLIP">Flip</option>
+        <option bit="1" name="LOOK_Y_AXIS">Y-Axis</option>
+        <option bit="2" name="LOOK_Z_AXIS">Z-Axis</option>
     </bitflags>
 
     <niobject name="NiLookAtController" inherit="NiTimeController" module="NiAnimation" until="V20_5_0_0">
@@ -4351,8 +4351,8 @@
     
     <bitflags name="NiSwitchFlags" storage="ushort">
         Flags for NiSwitchNode.
-        <option value="0" name="UpdateOnlyActiveChild">Update Only Active Child</option>
-        <option value="1" name="UpdateControllers">Update Controllers</option>
+        <option bit="0" name="UpdateOnlyActiveChild">Update Only Active Child</option>
+        <option bit="1" name="UpdateControllers">Update Controllers</option>
     </bitflags>
 
     <niobject name="NiSwitchNode" inherit="NiNode" module="NiMain">
@@ -5456,18 +5456,18 @@
     </enum>
 
     <bitflags name="NxBodyFlag" storage="uint" prefix="NX_BF" since="V20_2_0_8">
-        <option value="0" name="DISABLE_GRAVITY" />
-        <option value="1" name="FROZEN_POS_X" />
-        <option value="2" name="FROZEN_POS_Y" />
-        <option value="3" name="FROZEN_POS_Z" />
-        <option value="4" name="FROZEN_ROT_X" />
-        <option value="5" name="FROZEN_ROT_Y" />
-        <option value="6" name="FROZEN_ROT_Z" />
-        <option value="7" name="KINEMATIC" />
-        <option value="8" name="VISUALIZATION" />
-        <option value="9" name="POSE_SLEEP_TEST" />
-        <option value="10" name="FILTER_SLEEP_VEL" />
-        <option value="11" name="ENERGY_SLEEP_TEST" />
+        <option bit="0" name="DISABLE_GRAVITY" />
+        <option bit="1" name="FROZEN_POS_X" />
+        <option bit="2" name="FROZEN_POS_Y" />
+        <option bit="3" name="FROZEN_POS_Z" />
+        <option bit="4" name="FROZEN_ROT_X" />
+        <option bit="5" name="FROZEN_ROT_Y" />
+        <option bit="6" name="FROZEN_ROT_Z" />
+        <option bit="7" name="KINEMATIC" />
+        <option bit="8" name="VISUALIZATION" />
+        <option bit="9" name="POSE_SLEEP_TEST" />
+        <option bit="10" name="FILTER_SLEEP_VEL" />
+        <option bit="11" name="ENERGY_SLEEP_TEST" />
     </bitflags>
 
     <compound name="NiPhysXMaterialDescMap" size="6" since="V20_2_0_8">
@@ -5730,26 +5730,26 @@
     </enum>
 
     <bitflags name="NxShapeFlag" storage="uint" prefix="NX_SF" since="V20_2_0_8">
-        <option value="0" name="TRIGGER_ON_ENTER" />
-        <option value="1" name="TRIGGER_ON_LEAVE" />
-        <option value="2" name="TRIGGER_ON_STAY" />
-        <option value="3" name="VISUALIZATION" />
-        <option value="4" name="DISABLE_COLLISION" />
-        <option value="5" name="FEATURE_INDICES" />
-        <option value="6" name="DISABLE_RAYCASTING" />
-        <option value="7" name="POINT_CONTACT_FORCE" />
-        <option value="8" name="FLUID_DRAIN" />
-        <option value="10" name="FLUID_DISABLE_COLLISION" />
-        <option value="11" name="FLUID_TWOWAY" />
-        <option value="12" name="DISABLE_RESPONSE" />
-        <option value="13" name="DYNAMIC_DYNAMIC_CCD" />
-        <option value="14" name="DISABLE_SCENE_QUERIES" />
-        <option value="15" name="CLOTH_DRAIN" />
-        <option value="16" name="CLOTH_DISABLE_COLLISION" />
-        <option value="17" name="CLOTH_TWOWAY" />
-        <option value="18" name="SOFTBODY_DRAIN" />
-        <option value="19" name="SOFTBODY_DISABLE_COLLISION" />
-        <option value="20" name="SOFTBODY_TWOWAY" />
+        <option bit="0" name="TRIGGER_ON_ENTER" />
+        <option bit="1" name="TRIGGER_ON_LEAVE" />
+        <option bit="2" name="TRIGGER_ON_STAY" />
+        <option bit="3" name="VISUALIZATION" />
+        <option bit="4" name="DISABLE_COLLISION" />
+        <option bit="5" name="FEATURE_INDICES" />
+        <option bit="6" name="DISABLE_RAYCASTING" />
+        <option bit="7" name="POINT_CONTACT_FORCE" />
+        <option bit="8" name="FLUID_DRAIN" />
+        <option bit="10" name="FLUID_DISABLE_COLLISION" />
+        <option bit="11" name="FLUID_TWOWAY" />
+        <option bit="12" name="DISABLE_RESPONSE" />
+        <option bit="13" name="DYNAMIC_DYNAMIC_CCD" />
+        <option bit="14" name="DISABLE_SCENE_QUERIES" />
+        <option bit="15" name="CLOTH_DRAIN" />
+        <option bit="16" name="CLOTH_DISABLE_COLLISION" />
+        <option bit="17" name="CLOTH_TWOWAY" />
+        <option bit="18" name="SOFTBODY_DRAIN" />
+        <option bit="19" name="SOFTBODY_DISABLE_COLLISION" />
+        <option bit="20" name="SOFTBODY_TWOWAY" />
     </bitflags>
 
     <compound name="NxPlane" size="16" since="V20_2_0_8">
@@ -5797,9 +5797,9 @@
     </niobject>
 
     <bitflags name="NxMaterialFlag" storage="uint" prefix="NX_MF" since="V20_2_0_8">
-        <option value="0" name="ANISOTROPIC" />
-        <option value="4" name="DISABLE_FRICTION" />
-        <option value="5" name="DISABLE_STRONG_FRICTION" />
+        <option bit="0" name="ANISOTROPIC" />
+        <option bit="4" name="DISABLE_FRICTION" />
+        <option bit="5" name="DISABLE_STRONG_FRICTION" />
     </bitflags>
 
     <compound name="NxSpringDesc" size="12" since="V20_2_0_8">
@@ -5837,24 +5837,24 @@
     </niobject>
 
     <bitflags name="NxClothFlag" storage="uint" prefix="NX_CLF" since="V20_2_0_8">
-        <option value="0" name="PRESSURE" />
-        <option value="1" name="STATIC" />
-        <option value="2" name="DISABLE_COLLISION" />
-        <option value="3" name="SELFCOLLISION" />
-        <option value="4" name="VISUALIZATION" />
-        <option value="5" name="GRAVITY" />
-        <option value="6" name="BENDING" />
-        <option value="7" name="BENDING_ORTHO" />
-        <option value="8" name="DAMPING" />
-        <option value="9" name="COLLISION_TWOWAY" />
-        <option value="11" name="TRIANGLE_COLLISION" />
-        <option value="12" name="TEARABLE" />
-        <option value="13" name="HARDWARE" />
-        <option value="14" name="COMDAMPING" />
-        <option value="15" name="VALIDBOUNDS" />
-        <option value="16" name="FLUID_COLLISION" />
-        <option value="17" name="DISABLE_DYNAMIC_CCD" />
-        <option value="18" name="ADHERE" />
+        <option bit="0" name="PRESSURE" />
+        <option bit="1" name="STATIC" />
+        <option bit="2" name="DISABLE_COLLISION" />
+        <option bit="3" name="SELFCOLLISION" />
+        <option bit="4" name="VISUALIZATION" />
+        <option bit="5" name="GRAVITY" />
+        <option bit="6" name="BENDING" />
+        <option bit="7" name="BENDING_ORTHO" />
+        <option bit="8" name="DAMPING" />
+        <option bit="9" name="COLLISION_TWOWAY" />
+        <option bit="11" name="TRIANGLE_COLLISION" />
+        <option bit="12" name="TEARABLE" />
+        <option bit="13" name="HARDWARE" />
+        <option bit="14" name="COMDAMPING" />
+        <option bit="15" name="VALIDBOUNDS" />
+        <option bit="16" name="FLUID_COLLISION" />
+        <option bit="17" name="DISABLE_DYNAMIC_CCD" />
+        <option bit="18" name="ADHERE" />
     </bitflags>
 
     <compound name="PhysXClothState" since="V20_2_0_8">
@@ -6044,74 +6044,74 @@
     
     <bitflags name="BSShaderFlags" storage="uint" prefix="F3SF1" versions="#FO3#">
         Shader Property Flags
-        <option value="0" name="Specular">Enables Specularity</option>
-        <option value="1" name="Skinned">Required For Skinned Meshes</option>
-        <option value="2" name="LowDetail">Lowddetail (seems to use standard diff/norm/spec shader)</option>
-        <option value="3" name="Vertex_Alpha">Vertex Alpha</option>
-        <option value="4" name="Unknown_1">Unknown</option>
-        <option value="5" name="Single_Pass">Single Pass</option>
-        <option value="6" name="Empty">Unknown</option>
-        <option value="7" name="Environment_Mapping">Environment mapping (uses Envmap Scale)</option>
-        <option value="8" name="Alpha_Texture">Alpha Texture Requires NiAlphaProperty to Enable</option>
-        <option value="9" name="Unknown_2">Unknown</option>
-        <option value="10" name="FaceGen">FaceGen</option>
-        <option value="11" name="Parallax_Shader_Index_15">Parallax</option>
-        <option value="12" name="Unknown_3">Unknown/Crash</option>
-        <option value="13" name="Non_Projective_Shadows">Non-Projective Shadows</option>
-        <option value="14" name="Unknown_4">Unknown/Crash</option>
-        <option value="15" name="Refraction">Refraction (switches on refraction power)</option>
-        <option value="16" name="Fire_Refraction">Fire Refraction (switches on refraction power/period)</option>
-        <option value="17" name="Eye_Environment_Mapping">Eye Environment Mapping (does not use envmap light fade or envmap scale)</option>
-        <option value="18" name="Hair">Hair</option>
-        <option value="19" name="Dynamic_Alpha">Dynamic Alpha</option>
-        <option value="20" name="Localmap_Hide_Secret">Localmap Hide Secret</option>
-        <option value="21" name="Window_Environment_Mapping">Window Environment Mapping</option>
-        <option value="22" name="Tree_Billboard">Tree Billboard</option>
-        <option value="23" name="Shadow_Frustum">Shadow Frustum</option>
-        <option value="24" name="Multiple_Textures">Multiple Textures (base diff/norm become null)</option>
-        <option value="25" name="Remappable_Textures">usually seen w/texture animation</option>
-        <option value="26" name="Decal_Single_Pass">Decal</option>
-        <option value="27" name="Dynamic_Decal_Single_Pass">Dynamic Decal</option>
-        <option value="28" name="Parallax_Occulsion">Parallax Occlusion</option>
-        <option value="29" name="External_Emittance">External Emittance</option>
-        <option value="30" name="Shadow_Map">Shadow Map</option>
-        <option value="31" name="ZBuffer_Test">ZBuffer Test (1=on)</option>
+        <option bit="0" name="Specular">Enables Specularity</option>
+        <option bit="1" name="Skinned">Required For Skinned Meshes</option>
+        <option bit="2" name="LowDetail">Lowddetail (seems to use standard diff/norm/spec shader)</option>
+        <option bit="3" name="Vertex_Alpha">Vertex Alpha</option>
+        <option bit="4" name="Unknown_1">Unknown</option>
+        <option bit="5" name="Single_Pass">Single Pass</option>
+        <option bit="6" name="Empty">Unknown</option>
+        <option bit="7" name="Environment_Mapping">Environment mapping (uses Envmap Scale)</option>
+        <option bit="8" name="Alpha_Texture">Alpha Texture Requires NiAlphaProperty to Enable</option>
+        <option bit="9" name="Unknown_2">Unknown</option>
+        <option bit="10" name="FaceGen">FaceGen</option>
+        <option bit="11" name="Parallax_Shader_Index_15">Parallax</option>
+        <option bit="12" name="Unknown_3">Unknown/Crash</option>
+        <option bit="13" name="Non_Projective_Shadows">Non-Projective Shadows</option>
+        <option bit="14" name="Unknown_4">Unknown/Crash</option>
+        <option bit="15" name="Refraction">Refraction (switches on refraction power)</option>
+        <option bit="16" name="Fire_Refraction">Fire Refraction (switches on refraction power/period)</option>
+        <option bit="17" name="Eye_Environment_Mapping">Eye Environment Mapping (does not use envmap light fade or envmap scale)</option>
+        <option bit="18" name="Hair">Hair</option>
+        <option bit="19" name="Dynamic_Alpha">Dynamic Alpha</option>
+        <option bit="20" name="Localmap_Hide_Secret">Localmap Hide Secret</option>
+        <option bit="21" name="Window_Environment_Mapping">Window Environment Mapping</option>
+        <option bit="22" name="Tree_Billboard">Tree Billboard</option>
+        <option bit="23" name="Shadow_Frustum">Shadow Frustum</option>
+        <option bit="24" name="Multiple_Textures">Multiple Textures (base diff/norm become null)</option>
+        <option bit="25" name="Remappable_Textures">usually seen w/texture animation</option>
+        <option bit="26" name="Decal_Single_Pass">Decal</option>
+        <option bit="27" name="Dynamic_Decal_Single_Pass">Dynamic Decal</option>
+        <option bit="28" name="Parallax_Occulsion">Parallax Occlusion</option>
+        <option bit="29" name="External_Emittance">External Emittance</option>
+        <option bit="30" name="Shadow_Map">Shadow Map</option>
+        <option bit="31" name="ZBuffer_Test">ZBuffer Test (1=on)</option>
     </bitflags>
 
     <bitflags name="BSShaderFlags2" storage="uint" prefix="F3SF2" versions="#FO3#">
         Shader Property Flags 2
-        <option value="0" name="ZBuffer_Write">ZBuffer Write</option>
-        <option value="1" name="LOD_Landscape">LOD Landscape</option>
-        <option value="2" name="LOD_Building">LOD Building</option>
-        <option value="3" name="No_Fade">No Fade</option>
-        <option value="4" name="Refraction_Tint">Refraction Tint</option>
-        <option value="5" name="Vertex_Colors">Has Vertex Colors</option>
-        <option value="6" name="Unknown1">Unknown</option>
-        <option value="7" name="First_Light_is_Point_Light">1st Light is Point Light</option>
-        <option value="8" name="Second_Light">2nd Light</option>
-        <option value="9" name="Third_Light">3rd Light</option>
-        <option value="10" name="Vertex_Lighting">Vertex Lighting</option>
-        <option value="11" name="Uniform_Scale">Uniform Scale</option>
-        <option value="12" name="Fit_Slope">Fit Slope</option>
-        <option value="13" name="Billboard_and_Envmap_Light_Fade">Billboard and Envmap Light Fade</option>
-        <option value="14" name="No_LOD_Land_Blend">No LOD Land Blend</option>
-        <option value="15" name="Envmap_Light_Fade">Envmap Light Fade</option>
-        <option value="16" name="Wireframe">Wireframe</option>
-        <option value="17" name="VATS_Selection">VATS Selection</option>
-        <option value="18" name="Show_in_Local_Map">Show in Local Map</option>
-        <option value="19" name="Premult_Alpha">Premult Alpha</option>
-        <option value="20" name="Skip_Normal_Maps">Skip Normal Maps</option>
-        <option value="21" name="Alpha_Decal">Alpha Decal</option>
-        <option value="22" name="No_Transparecny_Multisampling">No Transparency MultiSampling</option>
-        <option value="23" name="Unknown2">Unknown</option>
-        <option value="24" name="Unknown3">Unknown</option>
-        <option value="25" name="Unknown4">Unknown</option>
-        <option value="26" name="Unknown5">Unknown</option>
-        <option value="27" name="Unknown6">Unknown</option>
-        <option value="28" name="Unknown7">Unknown</option>
-        <option value="29" name="Unknown8">Unknown</option>
-        <option value="30" name="Unknown9">Unknown</option>
-        <option value="31" name="Unknown10">Unknown</option>
+        <option bit="0" name="ZBuffer_Write">ZBuffer Write</option>
+        <option bit="1" name="LOD_Landscape">LOD Landscape</option>
+        <option bit="2" name="LOD_Building">LOD Building</option>
+        <option bit="3" name="No_Fade">No Fade</option>
+        <option bit="4" name="Refraction_Tint">Refraction Tint</option>
+        <option bit="5" name="Vertex_Colors">Has Vertex Colors</option>
+        <option bit="6" name="Unknown1">Unknown</option>
+        <option bit="7" name="First_Light_is_Point_Light">1st Light is Point Light</option>
+        <option bit="8" name="Second_Light">2nd Light</option>
+        <option bit="9" name="Third_Light">3rd Light</option>
+        <option bit="10" name="Vertex_Lighting">Vertex Lighting</option>
+        <option bit="11" name="Uniform_Scale">Uniform Scale</option>
+        <option bit="12" name="Fit_Slope">Fit Slope</option>
+        <option bit="13" name="Billboard_and_Envmap_Light_Fade">Billboard and Envmap Light Fade</option>
+        <option bit="14" name="No_LOD_Land_Blend">No LOD Land Blend</option>
+        <option bit="15" name="Envmap_Light_Fade">Envmap Light Fade</option>
+        <option bit="16" name="Wireframe">Wireframe</option>
+        <option bit="17" name="VATS_Selection">VATS Selection</option>
+        <option bit="18" name="Show_in_Local_Map">Show in Local Map</option>
+        <option bit="19" name="Premult_Alpha">Premult Alpha</option>
+        <option bit="20" name="Skip_Normal_Maps">Skip Normal Maps</option>
+        <option bit="21" name="Alpha_Decal">Alpha Decal</option>
+        <option bit="22" name="No_Transparecny_Multisampling">No Transparency MultiSampling</option>
+        <option bit="23" name="Unknown2">Unknown</option>
+        <option bit="24" name="Unknown3">Unknown</option>
+        <option bit="25" name="Unknown4">Unknown</option>
+        <option bit="26" name="Unknown5">Unknown</option>
+        <option bit="27" name="Unknown6">Unknown</option>
+        <option bit="28" name="Unknown7">Unknown</option>
+        <option bit="29" name="Unknown8">Unknown</option>
+        <option bit="30" name="Unknown9">Unknown</option>
+        <option bit="31" name="Unknown10">Unknown</option>
     </bitflags>
     
     <niobject name="BSShaderProperty" inherit="NiShadeProperty" module="BSMain" versions="#FO3_AND_LATER#">
@@ -6267,146 +6267,146 @@
 
     <bitflags name="SkyrimShaderPropertyFlags1" storage="uint" prefix="SLSF1" versions="#SKY# #SSE#">
         Skyrim Shader Property Flags 1
-        <option value="0" name="Specular">Enables Specularity</option>
-        <option value="1" name="Skinned">Required For Skinned Meshes.</option>
-        <option value="2" name="Temp_Refraction"></option>
-        <option value="3" name="Vertex_Alpha">Enables using alpha component of vertex colors.</option>
-        <option value="4" name="Greyscale_To_PaletteColor">in EffectShaderProperty</option>
-        <option value="5" name="Greyscale_To_PaletteAlpha">in EffectShaderProperty</option>
-        <option value="6" name="Use_Falloff">Use Falloff value in EffectShaderProperty</option>
-        <option value="7" name="Environment_Mapping">Environment mapping (uses Envmap Scale).</option>
-        <option value="8" name="Recieve_Shadows">Object can recieve shadows.</option>
-        <option value="9" name="Cast_Shadows">Can cast shadows</option>
-        <option value="10" name="Facegen_Detail_Map">Use a face detail map in the 4th texture slot.</option>
-        <option value="11" name="Parallax">Unused?</option>
-        <option value="12" name="Model_Space_Normals">Use Model space normals and an external Specular Map.</option>
-        <option value="13" name="Non_Projective_Shadows"></option>
-        <option value="14" name="Landscape"></option>
-        <option value="15" name="Refraction">Use normal map for refraction effect.</option>
-        <option value="16" name="Fire_Refraction"></option>
-        <option value="17" name="Eye_Environment_Mapping">Eye Environment Mapping (Must use the Eye shader and the model must be skinned)</option>
-        <option value="18" name="Hair_Soft_Lighting">Keeps from going too bright under lights (hair shader only)</option>
-        <option value="19" name="Screendoor_Alpha_Fade"></option>
-        <option value="20" name="Localmap_Hide_Secret">Object and anything it is positioned above will not render on local map view.</option>
-        <option value="21" name="FaceGen_RGB_Tint">Use tintmask for Face.</option>
-        <option value="22" name="Own_Emit">Provides its own emittance color. (will not absorb light/ambient color?)</option>
-        <option value="23" name="Projected_UV">Used for decalling?</option>
-        <option value="24" name="Multiple_Textures"></option>
-        <option value="25" name="Remappable_Textures"></option>
-        <option value="26" name="Decal"></option>
-        <option value="27" name="Dynamic_Decal"></option>
-        <option value="28" name="Parallax_Occlusion"></option>
-        <option value="29" name="External_Emittance"></option>
-        <option value="30" name="Soft_Effect"></option>
-        <option value="31" name="ZBuffer_Test">ZBuffer Test (1=on)</option>
+        <option bit="0" name="Specular">Enables Specularity</option>
+        <option bit="1" name="Skinned">Required For Skinned Meshes.</option>
+        <option bit="2" name="Temp_Refraction"></option>
+        <option bit="3" name="Vertex_Alpha">Enables using alpha component of vertex colors.</option>
+        <option bit="4" name="Greyscale_To_PaletteColor">in EffectShaderProperty</option>
+        <option bit="5" name="Greyscale_To_PaletteAlpha">in EffectShaderProperty</option>
+        <option bit="6" name="Use_Falloff">Use Falloff value in EffectShaderProperty</option>
+        <option bit="7" name="Environment_Mapping">Environment mapping (uses Envmap Scale).</option>
+        <option bit="8" name="Recieve_Shadows">Object can recieve shadows.</option>
+        <option bit="9" name="Cast_Shadows">Can cast shadows</option>
+        <option bit="10" name="Facegen_Detail_Map">Use a face detail map in the 4th texture slot.</option>
+        <option bit="11" name="Parallax">Unused?</option>
+        <option bit="12" name="Model_Space_Normals">Use Model space normals and an external Specular Map.</option>
+        <option bit="13" name="Non_Projective_Shadows"></option>
+        <option bit="14" name="Landscape"></option>
+        <option bit="15" name="Refraction">Use normal map for refraction effect.</option>
+        <option bit="16" name="Fire_Refraction"></option>
+        <option bit="17" name="Eye_Environment_Mapping">Eye Environment Mapping (Must use the Eye shader and the model must be skinned)</option>
+        <option bit="18" name="Hair_Soft_Lighting">Keeps from going too bright under lights (hair shader only)</option>
+        <option bit="19" name="Screendoor_Alpha_Fade"></option>
+        <option bit="20" name="Localmap_Hide_Secret">Object and anything it is positioned above will not render on local map view.</option>
+        <option bit="21" name="FaceGen_RGB_Tint">Use tintmask for Face.</option>
+        <option bit="22" name="Own_Emit">Provides its own emittance color. (will not absorb light/ambient color?)</option>
+        <option bit="23" name="Projected_UV">Used for decalling?</option>
+        <option bit="24" name="Multiple_Textures"></option>
+        <option bit="25" name="Remappable_Textures"></option>
+        <option bit="26" name="Decal"></option>
+        <option bit="27" name="Dynamic_Decal"></option>
+        <option bit="28" name="Parallax_Occlusion"></option>
+        <option bit="29" name="External_Emittance"></option>
+        <option bit="30" name="Soft_Effect"></option>
+        <option bit="31" name="ZBuffer_Test">ZBuffer Test (1=on)</option>
     </bitflags>
     
     <bitflags name="SkyrimShaderPropertyFlags2" storage="uint" prefix="SLSF2" versions="#SKY# #SSE#">
         Skyrim Shader Property Flags 2
-        <option value="0" name="ZBuffer_Write">Enables writing to the Z-Buffer</option>
-        <option value="1" name="LOD_Landscape"></option>
-        <option value="2" name="LOD_Objects"></option>
-        <option value="3" name="No_Fade"></option>
-        <option value="4" name="Double_Sided">Double-sided rendering.</option>
-        <option value="5" name="Vertex_Colors">Has Vertex Colors.</option>
-        <option value="6" name="Glow_Map">Use Glow Map in the third texture slot.</option>
-        <option value="7" name="Assume_Shadowmask"></option>
-        <option value="8" name="Packed_Tangent"></option>
-        <option value="9" name="Multi_Index_Snow"></option>
-        <option value="10" name="Vertex_Lighting"></option>
-        <option value="11" name="Uniform_Scale"></option>
-        <option value="12" name="Fit_Slope"></option>
-        <option value="13" name="Billboard"></option>
-        <option value="14" name="No_LOD_Land_Blend"></option>
-        <option value="15" name="EnvMap_Light_Fade"></option>
-        <option value="16" name="Wireframe">Wireframe (Seems to only work on particles)</option>
-        <option value="17" name="Weapon_Blood">Used for blood decals on weapons.</option>
-        <option value="18" name="Hide_On_Local_Map">Similar to hide secret, but only for self?</option>
-        <option value="19" name="Premult_Alpha">Has Premultiplied Alpha</option>
-        <option value="20" name="Cloud_LOD"></option>
-        <option value="21" name="Anisotropic_Lighting">Hair only?</option>
-        <option value="22" name="No_Transparency_Multisampling"></option>
-        <option value="23" name="Unused01">Unused?</option>
-        <option value="24" name="Multi_Layer_Parallax">Use Multilayer (inner-layer) Map</option>
-        <option value="25" name="Soft_Lighting">Use Soft Lighting Map</option>
-        <option value="26" name="Rim_Lighting">Use Rim Lighting Map</option>
-        <option value="27" name="Back_Lighting">Use Back Lighting Map</option>
-        <option value="28" name="Unused02">Unused?</option>
-        <option value="29" name="Tree_Anim">Enables Vertex Animation, Flutter Animation</option>
-        <option value="30" name="Effect_Lighting"></option>
-        <option value="31" name="HD_LOD_Objects"></option>
+        <option bit="0" name="ZBuffer_Write">Enables writing to the Z-Buffer</option>
+        <option bit="1" name="LOD_Landscape"></option>
+        <option bit="2" name="LOD_Objects"></option>
+        <option bit="3" name="No_Fade"></option>
+        <option bit="4" name="Double_Sided">Double-sided rendering.</option>
+        <option bit="5" name="Vertex_Colors">Has Vertex Colors.</option>
+        <option bit="6" name="Glow_Map">Use Glow Map in the third texture slot.</option>
+        <option bit="7" name="Assume_Shadowmask"></option>
+        <option bit="8" name="Packed_Tangent"></option>
+        <option bit="9" name="Multi_Index_Snow"></option>
+        <option bit="10" name="Vertex_Lighting"></option>
+        <option bit="11" name="Uniform_Scale"></option>
+        <option bit="12" name="Fit_Slope"></option>
+        <option bit="13" name="Billboard"></option>
+        <option bit="14" name="No_LOD_Land_Blend"></option>
+        <option bit="15" name="EnvMap_Light_Fade"></option>
+        <option bit="16" name="Wireframe">Wireframe (Seems to only work on particles)</option>
+        <option bit="17" name="Weapon_Blood">Used for blood decals on weapons.</option>
+        <option bit="18" name="Hide_On_Local_Map">Similar to hide secret, but only for self?</option>
+        <option bit="19" name="Premult_Alpha">Has Premultiplied Alpha</option>
+        <option bit="20" name="Cloud_LOD"></option>
+        <option bit="21" name="Anisotropic_Lighting">Hair only?</option>
+        <option bit="22" name="No_Transparency_Multisampling"></option>
+        <option bit="23" name="Unused01">Unused?</option>
+        <option bit="24" name="Multi_Layer_Parallax">Use Multilayer (inner-layer) Map</option>
+        <option bit="25" name="Soft_Lighting">Use Soft Lighting Map</option>
+        <option bit="26" name="Rim_Lighting">Use Rim Lighting Map</option>
+        <option bit="27" name="Back_Lighting">Use Back Lighting Map</option>
+        <option bit="28" name="Unused02">Unused?</option>
+        <option bit="29" name="Tree_Anim">Enables Vertex Animation, Flutter Animation</option>
+        <option bit="30" name="Effect_Lighting"></option>
+        <option bit="31" name="HD_LOD_Objects"></option>
     </bitflags>
 
     <bitflags name="Fallout4ShaderPropertyFlags1" storage="uint" prefix="F4SF1" versions="#FO4#">
         Fallout 4 Shader Property Flags 1
-        <option value="0" name="Specular" />
-        <option value="1" name="Skinned" />
-        <option value="2" name="Temp_Refraction" />
-        <option value="3" name="Vertex_Alpha" />
-        <option value="4" name="GreyscaleToPalette_Color" />
-        <option value="5" name="GreyscaleToPalette_Alpha" />
-        <option value="6" name="Use_Falloff" />
-        <option value="7" name="Environment_Mapping" />
-        <option value="8" name="RGB_Falloff" />
-        <option value="9" name="Cast_Shadows" />
-        <option value="10" name="Face" />
-        <option value="11" name="UI_Mask_Rects" />
-        <option value="12" name="Model_Space_Normals" />
-        <option value="13" name="Non_Projective_Shadows" />
-        <option value="14" name="Landscape" />
-        <option value="15" name="Refraction" />
-        <option value="16" name="Fire_Refraction" />
-        <option value="17" name="Eye_Environment_Mapping" />
-        <option value="18" name="Hair" />
-        <option value="19" name="Screendoor_Alpha_Fade" />
-        <option value="20" name="Localmap_Hide_Secret" />
-        <option value="21" name="Skin_Tint" />
-        <option value="22" name="Own_Emit" />
-        <option value="23" name="Projected_UV" />
-        <option value="24" name="Multiple_Textures" />
-        <option value="25" name="Tessellate" />
-        <option value="26" name="Decal" />
-        <option value="27" name="Dynamic_Decal" />
-        <option value="28" name="Character_Lighting" />
-        <option value="29" name="External_Emittance" />
-        <option value="30" name="Soft_Effect" />
-        <option value="31" name="ZBuffer_Test" />
+        <option bit="0" name="Specular" />
+        <option bit="1" name="Skinned" />
+        <option bit="2" name="Temp_Refraction" />
+        <option bit="3" name="Vertex_Alpha" />
+        <option bit="4" name="GreyscaleToPalette_Color" />
+        <option bit="5" name="GreyscaleToPalette_Alpha" />
+        <option bit="6" name="Use_Falloff" />
+        <option bit="7" name="Environment_Mapping" />
+        <option bit="8" name="RGB_Falloff" />
+        <option bit="9" name="Cast_Shadows" />
+        <option bit="10" name="Face" />
+        <option bit="11" name="UI_Mask_Rects" />
+        <option bit="12" name="Model_Space_Normals" />
+        <option bit="13" name="Non_Projective_Shadows" />
+        <option bit="14" name="Landscape" />
+        <option bit="15" name="Refraction" />
+        <option bit="16" name="Fire_Refraction" />
+        <option bit="17" name="Eye_Environment_Mapping" />
+        <option bit="18" name="Hair" />
+        <option bit="19" name="Screendoor_Alpha_Fade" />
+        <option bit="20" name="Localmap_Hide_Secret" />
+        <option bit="21" name="Skin_Tint" />
+        <option bit="22" name="Own_Emit" />
+        <option bit="23" name="Projected_UV" />
+        <option bit="24" name="Multiple_Textures" />
+        <option bit="25" name="Tessellate" />
+        <option bit="26" name="Decal" />
+        <option bit="27" name="Dynamic_Decal" />
+        <option bit="28" name="Character_Lighting" />
+        <option bit="29" name="External_Emittance" />
+        <option bit="30" name="Soft_Effect" />
+        <option bit="31" name="ZBuffer_Test" />
     </bitflags>
     
     <bitflags name="Fallout4ShaderPropertyFlags2" storage="uint" prefix="F4SF2" versions="#FO4#">
         Fallout 4 Shader Property Flags 2
-        <option value="0" name="ZBuffer_Write" />
-        <option value="1" name="LOD_Landscape" />
-        <option value="2" name="LOD_Objects" />
-        <option value="3" name="No_Fade" />
-        <option value="4" name="Double_Sided" />
-        <option value="5" name="Vertex_Colors" />
-        <option value="6" name="Glow_Map" />
-        <option value="7" name="Transform_Changed" />
-        <option value="8" name="Dismemberment_Meatcuff" />
-        <option value="9" name="Tint" />
-        <option value="10" name="Grass_Vertex_Lighting" />
-        <option value="11" name="Grass_Uniform_Scale" />
-        <option value="12" name="Grass_Fit_Slope" />
-        <option value="13" name="Grass_Billboard" />
-        <option value="14" name="No_LOD_Land_Blend" />
-        <option value="15" name="Dismemberment" />
-        <option value="16" name="Wireframe" />
-        <option value="17" name="Weapon_Blood" />
-        <option value="18" name="Hide_On_Local_Map" />
-        <option value="19" name="Premult_Alpha" />
-        <option value="20" name="VATS_Target" />
-        <option value="21" name="Anisotropic_Lighting" />
-        <option value="22" name="Skew_Specular_Alpha" />
-        <option value="23" name="Menu_Screen" />
-        <option value="24" name="Multi_Layer_Parallax" />
-        <option value="25" name="Alpha_Test" />
-        <option value="26" name="Gradient_Remap" />
-        <option value="27" name="VATS_Target_Draw_All" />
-        <option value="28" name="Pipboy_Screen" />
-        <option value="29" name="Tree_Anim" />
-        <option value="30" name="Effect_Lighting" />
-        <option value="31" name="Refraction_Writes_Depth" />
+        <option bit="0" name="ZBuffer_Write" />
+        <option bit="1" name="LOD_Landscape" />
+        <option bit="2" name="LOD_Objects" />
+        <option bit="3" name="No_Fade" />
+        <option bit="4" name="Double_Sided" />
+        <option bit="5" name="Vertex_Colors" />
+        <option bit="6" name="Glow_Map" />
+        <option bit="7" name="Transform_Changed" />
+        <option bit="8" name="Dismemberment_Meatcuff" />
+        <option bit="9" name="Tint" />
+        <option bit="10" name="Grass_Vertex_Lighting" />
+        <option bit="11" name="Grass_Uniform_Scale" />
+        <option bit="12" name="Grass_Fit_Slope" />
+        <option bit="13" name="Grass_Billboard" />
+        <option bit="14" name="No_LOD_Land_Blend" />
+        <option bit="15" name="Dismemberment" />
+        <option bit="16" name="Wireframe" />
+        <option bit="17" name="Weapon_Blood" />
+        <option bit="18" name="Hide_On_Local_Map" />
+        <option bit="19" name="Premult_Alpha" />
+        <option bit="20" name="VATS_Target" />
+        <option bit="21" name="Anisotropic_Lighting" />
+        <option bit="22" name="Skew_Specular_Alpha" />
+        <option bit="23" name="Menu_Screen" />
+        <option bit="24" name="Multi_Layer_Parallax" />
+        <option bit="25" name="Alpha_Test" />
+        <option bit="26" name="Gradient_Remap" />
+        <option bit="27" name="VATS_Target_Draw_All" />
+        <option bit="28" name="Pipboy_Screen" />
+        <option bit="29" name="Tree_Anim" />
+        <option bit="30" name="Effect_Lighting" />
+        <option bit="31" name="Refraction_Writes_Depth" />
     </bitflags>
 
     <compound name="BSTextureArray" versions="#F76#">
@@ -6572,20 +6572,20 @@
     
     <bitflags name="WaterShaderPropertyFlags" storage="uint" prefix="BSWSP" versions="#SKY_AND_LATER#">
         Skyrim water shader property flags
-        <option value="0" name="DISPLACEMENT" />
-        <option value="1" name="LOD" />
-        <option value="2" name="DEPTH" />
-        <option value="3" name="ACTOR_IN_WATER" />
-        <option value="4" name="ACTOR_IN_WATER_IS_MOVING" />
-        <option value="5" name="UNDERWATER" />
-        <option value="6" name="REFLECTIONS" />
-        <option value="7" name="REFRACTIONS" />
-        <option value="8" name="VERTEX_UV" />
-        <option value="9" name="VERTEX_ALPHA_DEPTH" />
-        <option value="10" name="PROCEDURAL" />
-        <option value="11" name="FOG" />
-        <option value="12" name="UPDATE_CONSTANTS" />
-        <option value="13" name="CUBEMAP" />
+        <option bit="0" name="DISPLACEMENT" />
+        <option bit="1" name="LOD" />
+        <option bit="2" name="DEPTH" />
+        <option bit="3" name="ACTOR_IN_WATER" />
+        <option bit="4" name="ACTOR_IN_WATER_IS_MOVING" />
+        <option bit="5" name="UNDERWATER" />
+        <option bit="6" name="REFLECTIONS" />
+        <option bit="7" name="REFRACTIONS" />
+        <option bit="8" name="VERTEX_UV" />
+        <option bit="9" name="VERTEX_ALPHA_DEPTH" />
+        <option bit="10" name="PROCEDURAL" />
+        <option bit="11" name="FOG" />
+        <option bit="12" name="UPDATE_CONSTANTS" />
+        <option bit="13" name="CUBEMAP" />
     </bitflags>
     
     <niobject name="BSWaterShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
@@ -6642,8 +6642,8 @@
 
     <bitflags name="BSValueNodeFlags" storage="byte" versions="#FO3_AND_LATER#">
         Flags for BSValueNode.
-        <option value="0" name="BillboardWorldZ" />
-        <option value="1" name="UsePlayerAdjust" />
+        <option bit="0" name="BillboardWorldZ" />
+        <option bit="1" name="UsePlayerAdjust" />
     </bitflags>
 
     <niobject name="BSValueNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
@@ -7056,13 +7056,13 @@
     
     <bitflags name="DataStreamAccess" storage="uint" since="V20_5_0_0">
         Determines how the data stream is accessed?
-        <option value="0" name="CPU Read"></option>
-        <option value="1" name="CPU Write Static"></option>
-        <option value="2" name="CPU Write Mutable"></option>
-        <option value="3" name="CPU Write Volatile"></option>
-        <option value="4" name="GPU Read"></option>
-        <option value="5" name="GPU Write"></option>
-        <option value="6" name="CPU Write Static Inititialized"></option>
+        <option bit="0" name="CPU Read"></option>
+        <option bit="1" name="CPU Write Static"></option>
+        <option bit="2" name="CPU Write Mutable"></option>
+        <option bit="3" name="CPU Write Volatile"></option>
+        <option bit="4" name="GPU Read"></option>
+        <option bit="5" name="GPU Write"></option>
+        <option bit="6" name="CPU Write Static Inititialized"></option>
     </bitflags>
 
 
@@ -7945,16 +7945,16 @@
         Bit Patterns:
             AUTO_CALC_NEARFAR = (AUTO_NEAR_DIST | AUTO_FAR_DIST) = 0xC0
             AUTO_CALC_FULL = (AUTO_NEAR_DIST | AUTO_FAR_DIST | AUTO_DIR_LIGHT_FRUSTUM_WIDTH | AUTO_DIR_LIGHT_FRUSTUM_POSITION) = 0x3C0
-        <option value="0" name="DIRTY_SHADOWMAP" />
-        <option value="1" name="DIRTY_RENDERVIEWS" />
-        <option value="2" name="GEN_STATIC" />
-        <option value="3" name="GEN_ACTIVE" />
-        <option value="4" name="RENDER_BACKFACES" />
-        <option value="5" name="STRICTLY_OBSERVE_SIZE_HINT" />
-        <option value="6" name="AUTO_NEAR_DIST" />
-        <option value="7" name="AUTO_FAR_DIST" />
-        <option value="8" name="AUTO_DIR_LIGHT_FRUSTUM_WIDTH" />
-        <option value="9" name="AUTO_DIR_LIGHT_FRUSTUM_POSITION" />
+        <option bit="0" name="DIRTY_SHADOWMAP" />
+        <option bit="1" name="DIRTY_RENDERVIEWS" />
+        <option bit="2" name="GEN_STATIC" />
+        <option bit="3" name="GEN_ACTIVE" />
+        <option bit="4" name="RENDER_BACKFACES" />
+        <option bit="5" name="STRICTLY_OBSERVE_SIZE_HINT" />
+        <option bit="6" name="AUTO_NEAR_DIST" />
+        <option bit="7" name="AUTO_FAR_DIST" />
+        <option bit="8" name="AUTO_DIR_LIGHT_FRUSTUM_WIDTH" />
+        <option bit="9" name="AUTO_DIR_LIGHT_FRUSTUM_POSITION" />
     </bitflags>
 
     <niobject name="NiShadowGenerator" inherit="NiObject" module="NiMain">

From eb53e9806ea29ea0e31e21845228c1fe620c6597 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 23 Apr 2019 07:25:02 -0400
Subject: [PATCH 84/86] Block Type Hashes for 20.3.1.2

---
 nif.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nif.xml b/nif.xml
index ccb27a9..a778f67 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1887,7 +1887,8 @@
         <add name="BS Header" type="BSStreamHeader" cond="#BSSTREAMHEADER#" />
         <add name="Metadata" type="ByteArray" ver1="30.0.0.0" />
         <add name="Num Block Types" type="ushort" ver1="5.0.0.1">Number of object types in this NIF file.</add>
-        <add name="Block Types" type="SizedString" arr1="Num Block Types" ver1="5.0.0.1">List of all object types used in this NIF file.</add>
+        <add name="Block Types" type="SizedString" arr1="Num Block Types" ver1="5.0.0.1" cond="Version != 20.3.1.2">List of all object types used in this NIF file.</add>
+        <add name="Block Type Hashes" type="uint" arr1="Num Block Types" ver1="20.3.1.2" ver2="20.3.1.2">List of all object types used in this NIF file.</add>
         <add name="Block Type Index" type="BlockTypeIndex" arr1="Num Blocks" ver1="5.0.0.1">Maps file objects on their corresponding type: first file object is of type object_types[object_type_index[0]], the second of object_types[object_type_index[1]], etc.</add>
         <add name="Block Size" type="uint" arr1="Num Blocks" ver1="20.2.0.5">Array of block sizes</add>
         <add name="Num Strings" type="uint" ver1="20.1.0.1">Number of strings.</add>

From cd920424880122c539cd3c9af792d43b0774ce3e Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 23 Apr 2019 07:35:38 -0400
Subject: [PATCH 85/86] Misc Fixes

---
 nif.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nif.xml b/nif.xml
index a778f67..5ffea7f 100644
--- a/nif.xml
+++ b/nif.xml
@@ -2456,7 +2456,7 @@
         <add name="Sphere" type="NiBound" cond="Collision Type == 0" />
         <add name="Box" type="BoxBV" cond="Collision Type == 1" />
         <add name="Capsule" type="CapsuleBV" cond="Collision Type == 2" />
-        <add name="Union BV" type="UnionBV" cond="Collision Type == 4" />
+        <!--<add name="Union BV" type="UnionBV" cond="Collision Type == 4" />-->
         <add name="Half Space" type="HalfSpaceBV" cond="Collision Type == 5" />
     </compound>
 
@@ -4187,6 +4187,8 @@
         <add name="Type" type="FieldType">The force field type.</add>
         <add name="Position" type="Vector3">The position of the mass point relative to the particle system.</add>
         <add name="Direction" type="Vector3">The direction of the applied acceleration.</add>
+        <add name="Unknown 01" type="float" ver2="2.3" />
+        <add name="Unknown 02" type="float" ver2="2.3" />
     </niobject>
 
     <niobject name="NiIntegerExtraData" inherit="NiExtraData" module="NiMain">
@@ -6032,7 +6034,7 @@
     </niobject>
 
     <enum name="BSShaderType" storage="uint" versions="#FO3#">
-        The type of animation interpolation (blending) that will be used on the associated key frames.
+        FO3 Shader Type
         <option value="0" name="SHADER_TALL_GRASS">Tall Grass Shader</option>
         <option value="1" name="SHADER_DEFAULT">Standard Lighting Shader</option>
         <option value="10" name="SHADER_SKY">Sky Shader</option>

From 45c15ade2ec35aebcab1757a6ad01c6e9bce9b37 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 23 Apr 2019 09:17:56 -0400
Subject: [PATCH 86/86] Rename 'add' to 'field'

---
 nif.xml | 5728 +++++++++++++++++++++++++++----------------------------
 1 file changed, 2864 insertions(+), 2864 deletions(-)

diff --git a/nif.xml b/nif.xml
index 5ffea7f..c160de1 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1574,262 +1574,262 @@
 
     <compound name="SizedString">
         A string of given length.
-        <add name="Length" type="uint">The string length.</add>
-        <add name="Value" type="char" arr1="Length">The string itself.</add>
+        <field name="Length" type="uint">The string length.</field>
+        <field name="Value" type="char" arr1="Length">The string itself.</field>
     </compound>
 
     <compound name="SizedString16">
         A string of given length, using a ushort to store string length.
-        <add name="Length" type="ushort">The string length.</add>
-        <add name="Value" type="char" arr1="Length">The string itself.</add>
+        <field name="Length" type="ushort">The string length.</field>
+        <field name="Value" type="char" arr1="Length">The string itself.</field>
     </compound>
 
     <compound name="string">
         A string type.
-        <add name="String" type="SizedString" ver2="20.0.0.5">The normal string.</add>
-        <add name="Index" type="NiFixedString" ver1="20.1.0.3">The string index.</add>
+        <field name="String" type="SizedString" ver2="20.0.0.5">The normal string.</field>
+        <field name="Index" type="NiFixedString" ver1="20.1.0.3">The string index.</field>
     </compound>
 
     <compound name="NiTFixedStringMapItem" generic="true">
         Currently, #T# must be a basic type due to nif.xml restrictions.
-        <add name="String" type="NiFixedString" />
-        <add name="Value" type="#T#" />
+        <field name="String" type="NiFixedString" />
+        <field name="Value" type="#T#" />
     </compound>
 
     <compound name="NiTFixedStringMap" generic="true">
         A mapping or hash table between NiFixedString keys and a generic value.
         Currently, #T# must be a basic type due to nif.xml restrictions.
-        <add name="Num Strings" type="uint" />
-        <add name="Strings" type="NiTFixedStringMapItem" template="#T#" arr1="Num Strings" />
+        <field name="Num Strings" type="uint" />
+        <field name="Strings" type="NiTFixedStringMapItem" template="#T#" arr1="Num Strings" />
     </compound>
 
     <compound name="ByteArray">
         An array of bytes.
-        <add name="Data Size" type="uint">The number of bytes in this array</add>
-        <add name="Data" type="byte" arr1="Data Size">The bytes which make up the array</add>
+        <field name="Data Size" type="uint">The number of bytes in this array</field>
+        <field name="Data" type="byte" arr1="Data Size">The bytes which make up the array</field>
     </compound>
 
     <compound name="ByteMatrix">
         An array of bytes.
-        <add name="Data Size 1" type="uint">The number of bytes in this array</add>
-        <add name="Data Size 2" type="uint">The number of bytes in this array</add>
-        <add name="Data" type="byte" arr1="Data Size 2" arr2="Data Size 1">The bytes which make up the array</add>
+        <field name="Data Size 1" type="uint">The number of bytes in this array</field>
+        <field name="Data Size 2" type="uint">The number of bytes in this array</field>
+        <field name="Data" type="byte" arr1="Data Size 2" arr2="Data Size 1">The bytes which make up the array</field>
     </compound>
 
     <compound name="Color3" size="12">
         A color without alpha (red, green, blue).
-        <add name="r" type="float">Red color component.</add>
-        <add name="g" type="float">Green color component.</add>
-        <add name="b" type="float">Blue color component.</add>
+        <field name="r" type="float">Red color component.</field>
+        <field name="g" type="float">Green color component.</field>
+        <field name="b" type="float">Blue color component.</field>
     </compound>
 
     <compound name="ByteColor3" size="3" convertible="Color3">
         A color without alpha (red, green, blue).
-        <add name="r" type="byte">Red color component.</add>
-        <add name="g" type="byte">Green color component.</add>
-        <add name="b" type="byte">Blue color component.</add>
+        <field name="r" type="byte">Red color component.</field>
+        <field name="g" type="byte">Green color component.</field>
+        <field name="b" type="byte">Blue color component.</field>
     </compound>
 
     <compound name="Color4" size="16">
         A color with alpha (red, green, blue, alpha).
-        <add name="r" type="float">Red component.</add>
-        <add name="g" type="float">Green component.</add>
-        <add name="b" type="float">Blue component.</add>
-        <add name="a" type="float">Alpha.</add>
+        <field name="r" type="float">Red component.</field>
+        <field name="g" type="float">Green component.</field>
+        <field name="b" type="float">Blue component.</field>
+        <field name="a" type="float">Alpha.</field>
     </compound>
 
     <compound name="ByteColor4" size="4" convertible="Color4">
         A color with alpha (red, green, blue, alpha).
-        <add name="r" type="byte">Red color component.</add>
-        <add name="g" type="byte">Green color component.</add>
-        <add name="b" type="byte">Blue color component.</add>
-        <add name="a" type="byte">Alpha color component.</add>
+        <field name="r" type="byte">Red color component.</field>
+        <field name="g" type="byte">Green color component.</field>
+        <field name="b" type="byte">Blue color component.</field>
+        <field name="a" type="byte">Alpha color component.</field>
     </compound>
 
     <compound name="FilePath">
         A string that contains the path to a file.
-        <add name="String" type="SizedString" ver2="20.0.0.5">The normal string.</add>
-        <add name="Index" type="NiFixedString" ver1="20.1.0.3">The string index.</add>
+        <field name="String" type="SizedString" ver2="20.0.0.5">The normal string.</field>
+        <field name="Index" type="NiFixedString" ver1="20.1.0.3">The string index.</field>
     </compound>
 
     <compound name="Footer">
         The NIF file footer.
-        <add name="Num Roots" type="uint" ver1="3.3.0.13">The number of root references.</add>
-        <add name="Roots" type="Ref" template="NiObject" arr1="Num Roots" ver1="3.3.0.13">List of root NIF objects. If there is a camera, for 1st person view, then this NIF object is referred to as well in this list, even if it is not a root object (usually we want the camera to be attached to the Bip Head node).</add>
+        <field name="Num Roots" type="uint" ver1="3.3.0.13">The number of root references.</field>
+        <field name="Roots" type="Ref" template="NiObject" arr1="Num Roots" ver1="3.3.0.13">List of root NIF objects. If there is a camera, for 1st person view, then this NIF object is referred to as well in this list, even if it is not a root object (usually we want the camera to be attached to the Bip Head node).</field>
     </compound>
 
     <compound name="LODRange">
         The distance range where a specific level of detail applies.
-        <add name="Near Extent" type="float">Begining of range.</add>
-        <add name="Far Extent" type="float">End of Range.</add>
-        <add name="Unknown Ints" type="uint" arr1="3" ver2="3.1" />
+        <field name="Near Extent" type="float">Begining of range.</field>
+        <field name="Far Extent" type="float">End of Range.</field>
+        <field name="Unknown Ints" type="uint" arr1="3" ver2="3.1" />
     </compound>
 
     <compound name="MatchGroup">
         Group of vertex indices of vertices that match.
-        <add name="Num Vertices" type="ushort">Number of vertices in this group.</add>
-        <add name="Vertex Indices" type="ushort" arr1="Num Vertices">The vertex indices.</add>
+        <field name="Num Vertices" type="ushort">Number of vertices in this group.</field>
+        <field name="Vertex Indices" type="ushort" arr1="Num Vertices">The vertex indices.</field>
     </compound>
     
     <compound name="Vector3" size="12">
         A vector in 3D space (x,y,z).
-        <add name="x" type="float">First coordinate.</add>
-        <add name="y" type="float">Second coordinate.</add>
-        <add name="z" type="float">Third coordinate.</add>
+        <field name="x" type="float">First coordinate.</field>
+        <field name="y" type="float">Second coordinate.</field>
+        <field name="z" type="float">Third coordinate.</field>
     </compound>
     
     <compound name="HalfVector3" size="6" convertible="Vector3">
         A vector in 3D space (x,y,z).
-        <add name="x" type="hfloat">First coordinate.</add>
-        <add name="y" type="hfloat">Second coordinate.</add>
-        <add name="z" type="hfloat">Third coordinate.</add>
+        <field name="x" type="hfloat">First coordinate.</field>
+        <field name="y" type="hfloat">Second coordinate.</field>
+        <field name="z" type="hfloat">Third coordinate.</field>
     </compound>
 
     <compound name="ByteVector3" size="3" convertible="Vector3">
         A vector in 3D space (x,y,z).
-        <add name="x" type="byte">First coordinate.</add>
-        <add name="y" type="byte">Second coordinate.</add>
-        <add name="z" type="byte">Third coordinate.</add>
+        <field name="x" type="byte">First coordinate.</field>
+        <field name="y" type="byte">Second coordinate.</field>
+        <field name="z" type="byte">Third coordinate.</field>
     </compound>
 
     <compound name="Vector4" size="16">
         A 4-dimensional vector.
-        <add name="x" type="float">First coordinate.</add>
-        <add name="y" type="float">Second coordinate.</add>
-        <add name="z" type="float">Third coordinate.</add>
-        <add name="w" type="float">Fourth coordinate.</add>
+        <field name="x" type="float">First coordinate.</field>
+        <field name="y" type="float">Second coordinate.</field>
+        <field name="z" type="float">Third coordinate.</field>
+        <field name="w" type="float">Fourth coordinate.</field>
     </compound>
 
     <compound name="Quaternion" size="16">
         A quaternion.
-        <add name="w" type="float" default="1.0">The w-coordinate.</add>
-        <add name="x" type="float" default="0.0">The x-coordinate.</add>
-        <add name="y" type="float" default="0.0">The y-coordinate.</add>
-        <add name="z" type="float" default="0.0">The z-coordinate.</add>
+        <field name="w" type="float" default="1.0">The w-coordinate.</field>
+        <field name="x" type="float" default="0.0">The x-coordinate.</field>
+        <field name="y" type="float" default="0.0">The y-coordinate.</field>
+        <field name="z" type="float" default="0.0">The z-coordinate.</field>
     </compound>
 
     <compound name="hkQuaternion" size="16" versions="#BETHESDA#">
         A quaternion as it appears in the havok objects.
-        <add name="x" type="float" default="0.0">The x-coordinate.</add>
-        <add name="y" type="float" default="0.0">The y-coordinate.</add>
-        <add name="z" type="float" default="0.0">The z-coordinate.</add>
-        <add name="w" type="float" default="1.0">The w-coordinate.</add>
+        <field name="x" type="float" default="0.0">The x-coordinate.</field>
+        <field name="y" type="float" default="0.0">The y-coordinate.</field>
+        <field name="z" type="float" default="0.0">The z-coordinate.</field>
+        <field name="w" type="float" default="1.0">The w-coordinate.</field>
     </compound>
 
     <compound name="Matrix22" size="16">
         A 2x2 matrix of float values.  Stored in OpenGL column-major format.
-        <add name="m11" type="float" default="1.0">Member 1,1 (top left)</add>
-        <add name="m21" type="float" default="0.0">Member 2,1 (bottom left)</add>
-        <add name="m12" type="float" default="0.0">Member 1,2 (top right)</add>
-        <add name="m22" type="float" default="1.0">Member 2,2 (bottom right)</add>
+        <field name="m11" type="float" default="1.0">Member 1,1 (top left)</field>
+        <field name="m21" type="float" default="0.0">Member 2,1 (bottom left)</field>
+        <field name="m12" type="float" default="0.0">Member 1,2 (top right)</field>
+        <field name="m22" type="float" default="1.0">Member 2,2 (bottom right)</field>
     </compound>
 
     <compound name="Matrix33" size="36">
         A 3x3 rotation matrix; M^T M=identity, det(M)=1.    Stored in OpenGL column-major format.
-        <add name="m11" type="float" default="1.0">Member 1,1 (top left)</add>
-        <add name="m21" type="float" default="0.0">Member 2,1</add>
-        <add name="m31" type="float" default="0.0">Member 3,1 (bottom left)</add>
-        <add name="m12" type="float" default="0.0">Member 1,2</add>
-        <add name="m22" type="float" default="1.0">Member 2,2</add>
-        <add name="m32" type="float" default="0.0">Member 3,2</add>
-        <add name="m13" type="float" default="0.0">Member 1,3 (top right)</add>
-        <add name="m23" type="float" default="0.0">Member 2,3</add>
-        <add name="m33" type="float" default="1.0">Member 3,3 (bottom left)</add>
+        <field name="m11" type="float" default="1.0">Member 1,1 (top left)</field>
+        <field name="m21" type="float" default="0.0">Member 2,1</field>
+        <field name="m31" type="float" default="0.0">Member 3,1 (bottom left)</field>
+        <field name="m12" type="float" default="0.0">Member 1,2</field>
+        <field name="m22" type="float" default="1.0">Member 2,2</field>
+        <field name="m32" type="float" default="0.0">Member 3,2</field>
+        <field name="m13" type="float" default="0.0">Member 1,3 (top right)</field>
+        <field name="m23" type="float" default="0.0">Member 2,3</field>
+        <field name="m33" type="float" default="1.0">Member 3,3 (bottom left)</field>
     </compound>
 
     <compound name="Matrix34" size="48">
         A 3x4 transformation matrix.
-        <add name="m11" type="float" default="1.0">The (1,1) element.</add>
-        <add name="m21" type="float" default="0.0">The (2,1) element.</add>
-        <add name="m31" type="float" default="0.0">The (3,1) element.</add>
-        <add name="m12" type="float" default="0.0">The (1,2) element.</add>
-        <add name="m22" type="float" default="1.0">The (2,2) element.</add>
-        <add name="m32" type="float" default="0.0">The (3,2) element.</add>
-        <add name="m13" type="float" default="0.0">The (1,3) element.</add>
-        <add name="m23" type="float" default="0.0">The (2,3) element.</add>
-        <add name="m33" type="float" default="1.0">The (3,3) element.</add>
-        <add name="m14" type="float" default="0.0">The (1,4) element.</add>
-        <add name="m24" type="float" default="0.0">The (2,4) element.</add>
-        <add name="m34" type="float" default="0.0">The (3,4) element.</add>
+        <field name="m11" type="float" default="1.0">The (1,1) element.</field>
+        <field name="m21" type="float" default="0.0">The (2,1) element.</field>
+        <field name="m31" type="float" default="0.0">The (3,1) element.</field>
+        <field name="m12" type="float" default="0.0">The (1,2) element.</field>
+        <field name="m22" type="float" default="1.0">The (2,2) element.</field>
+        <field name="m32" type="float" default="0.0">The (3,2) element.</field>
+        <field name="m13" type="float" default="0.0">The (1,3) element.</field>
+        <field name="m23" type="float" default="0.0">The (2,3) element.</field>
+        <field name="m33" type="float" default="1.0">The (3,3) element.</field>
+        <field name="m14" type="float" default="0.0">The (1,4) element.</field>
+        <field name="m24" type="float" default="0.0">The (2,4) element.</field>
+        <field name="m34" type="float" default="0.0">The (3,4) element.</field>
     </compound>
 
     <compound name="Matrix44" size="64">
         A 4x4 transformation matrix.
-        <add name="m11" type="float" default="1.0">The (1,1) element.</add>
-        <add name="m21" type="float" default="0.0">The (2,1) element.</add>
-        <add name="m31" type="float" default="0.0">The (3,1) element.</add>
-        <add name="m41" type="float" default="0.0">The (4,1) element.</add>
-        <add name="m12" type="float" default="0.0">The (1,2) element.</add>
-        <add name="m22" type="float" default="1.0">The (2,2) element.</add>
-        <add name="m32" type="float" default="0.0">The (3,2) element.</add>
-        <add name="m42" type="float" default="0.0">The (4,2) element.</add>
-        <add name="m13" type="float" default="0.0">The (1,3) element.</add>
-        <add name="m23" type="float" default="0.0">The (2,3) element.</add>
-        <add name="m33" type="float" default="1.0">The (3,3) element.</add>
-        <add name="m43" type="float" default="0.0">The (4,3) element.</add>
-        <add name="m14" type="float" default="0.0">The (1,4) element.</add>
-        <add name="m24" type="float" default="0.0">The (2,4) element.</add>
-        <add name="m34" type="float" default="0.0">The (3,4) element.</add>
-        <add name="m44" type="float" default="1.0">The (4,4) element.</add>
+        <field name="m11" type="float" default="1.0">The (1,1) element.</field>
+        <field name="m21" type="float" default="0.0">The (2,1) element.</field>
+        <field name="m31" type="float" default="0.0">The (3,1) element.</field>
+        <field name="m41" type="float" default="0.0">The (4,1) element.</field>
+        <field name="m12" type="float" default="0.0">The (1,2) element.</field>
+        <field name="m22" type="float" default="1.0">The (2,2) element.</field>
+        <field name="m32" type="float" default="0.0">The (3,2) element.</field>
+        <field name="m42" type="float" default="0.0">The (4,2) element.</field>
+        <field name="m13" type="float" default="0.0">The (1,3) element.</field>
+        <field name="m23" type="float" default="0.0">The (2,3) element.</field>
+        <field name="m33" type="float" default="1.0">The (3,3) element.</field>
+        <field name="m43" type="float" default="0.0">The (4,3) element.</field>
+        <field name="m14" type="float" default="0.0">The (1,4) element.</field>
+        <field name="m24" type="float" default="0.0">The (2,4) element.</field>
+        <field name="m34" type="float" default="0.0">The (3,4) element.</field>
+        <field name="m44" type="float" default="1.0">The (4,4) element.</field>
     </compound>
 
     <compound name="hkMatrix3" size="48" versions="#BETHESDA#">
         A 3x3 Havok matrix stored in 4x3 due to memory alignment.
-        <add name="m11" type="float" default="1.0" />
-        <add name="m12" type="float" />
-        <add name="m13" type="float" />
-        <add name="m14" type="float">Unused</add>
-        <add name="m21" type="float" />
-        <add name="m22" type="float" default="1.0" />
-        <add name="m23" type="float" />
-        <add name="m24" type="float">Unused</add>
-        <add name="m31" type="float" />
-        <add name="m32" type="float" />
-        <add name="m33" type="float" default="1.0" />
-        <add name="m34" type="float">Unused</add>
+        <field name="m11" type="float" default="1.0" />
+        <field name="m12" type="float" />
+        <field name="m13" type="float" />
+        <field name="m14" type="float">Unused</field>
+        <field name="m21" type="float" />
+        <field name="m22" type="float" default="1.0" />
+        <field name="m23" type="float" />
+        <field name="m24" type="float">Unused</field>
+        <field name="m31" type="float" />
+        <field name="m32" type="float" />
+        <field name="m33" type="float" default="1.0" />
+        <field name="m34" type="float">Unused</field>
     </compound>
 
     <compound name="MipMap" size="12">
         Description of a mipmap within an NiPixelData object.
-        <add name="Width" type="uint">Width of the mipmap image.</add>
-        <add name="Height" type="uint">Height of the mipmap image.</add>
-        <add name="Offset" type="uint">Offset into the pixel data array where this mipmap starts.</add>
+        <field name="Width" type="uint">Width of the mipmap image.</field>
+        <field name="Height" type="uint">Height of the mipmap image.</field>
+        <field name="Offset" type="uint">Offset into the pixel data array where this mipmap starts.</field>
     </compound>
 
     <compound name="NodeSet">
         A set of NiNode references.
-        <add name="Num Nodes" type="uint">Number of node references that follow.</add>
-        <add name="Nodes" type="Ptr" template="NiNode" arr1="Num Nodes">The list of NiNode references.</add>
+        <field name="Num Nodes" type="uint">Number of node references that follow.</field>
+        <field name="Nodes" type="Ptr" template="NiNode" arr1="Num Nodes">The list of NiNode references.</field>
     </compound>
 
     <compound name="ExportString">
         Specific to Bethesda-specific header export strings.
-        <add name="Length" type="byte">The string length.</add>
-        <add name="Value" type="char" arr1="Length">The string itself, null terminated (the null terminator is taken into account in the length byte).</add>
+        <field name="Length" type="byte">The string length.</field>
+        <field name="Value" type="char" arr1="Length">The string itself, null terminated (the null terminator is taken into account in the length byte).</field>
     </compound>
 
     <compound name="SkinInfo" size="8" since="V4_2_2_0">
         NiBoneLODController::SkinInfo. Reference to shape and skin instance.
-        <add name="Shape" type="Ptr" template="NiTriBasedGeom" />
-        <add name="Skin Instance" type="Ref" template="NiSkinInstance" />
+        <field name="Shape" type="Ptr" template="NiTriBasedGeom" />
+        <field name="Skin Instance" type="Ref" template="NiSkinInstance" />
     </compound>
 
     <compound name="SkinInfoSet" since="V4_2_2_0">
         A set of NiBoneLODController::SkinInfo.
-        <add name="Num Skin Info" type="uint" />
-        <add name="Skin Info" type="SkinInfo" arr1="Num Skin Info" />
+        <field name="Num Skin Info" type="uint" />
+        <field name="Skin Info" type="SkinInfo" arr1="Num Skin Info" />
     </compound>
 
     <compound name="BoneVertData" size="6">
         NiSkinData::BoneVertData. A vertex and its weight.
-        <add name="Index" type="ushort">The vertex index, in the mesh.</add>
-        <add name="Weight" type="float" range="#F0_1#">The vertex weight - between 0.0 and 1.0</add>
+        <field name="Index" type="ushort">The vertex index, in the mesh.</field>
+        <field name="Weight" type="float" range="#F0_1#">The vertex weight - between 0.0 and 1.0</field>
     </compound>
 
     <compound name="AVObject">
         Used in NiDefaultAVObjectPalette.
-        <add name="Name" type="SizedString">Object name.</add>
-        <add name="AV Object" type="Ptr" template="NiAVObject">Object reference.</add>
+        <field name="Name" type="SizedString">Object name.</field>
+        <field name="AV Object" type="Ptr" template="NiAVObject">Object reference.</field>
     </compound>
 
     <compound name="ControlledBlock">
@@ -1837,114 +1837,114 @@
         For Controller ID, NiInterpController::GetCtlrID() virtual function returns a string formatted specifically for the derived type.
         For Interpolator ID, NiInterpController::GetInterpolatorID() virtual function returns a string formatted specifically for the derived type.
         The string formats are documented on the relevant niobject blocks.
-        <add name="Target Name" type="SizedString" ver2="10.1.0.103">Name of a controllable object in another NIF file.</add>
+        <field name="Target Name" type="SizedString" ver2="10.1.0.103">Name of a controllable object in another NIF file.</field>
         <!-- NiControllerSequence::InterpArrayItem -->
-        <add name="Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.106" />
-        <add name="Controller" type="Ref" template="NiTimeController" ver2="20.5.0.0" />
-        <add name="Blend Interpolator" type="Ref" template="NiBlendInterpolator" ver1="10.1.0.104" ver2="10.1.0.110" />
-        <add name="Blend Index" type="ushort" ver1="10.1.0.104" ver2="10.1.0.110" />
-        <add name="Priority" type="byte" ver1="10.1.0.106" vercond="#BSSTREAM#">Idle animations tend to have low values for this, and high values tend to correspond with the important parts of the animations.</add>
+        <field name="Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.106" />
+        <field name="Controller" type="Ref" template="NiTimeController" ver2="20.5.0.0" />
+        <field name="Blend Interpolator" type="Ref" template="NiBlendInterpolator" ver1="10.1.0.104" ver2="10.1.0.110" />
+        <field name="Blend Index" type="ushort" ver1="10.1.0.104" ver2="10.1.0.110" />
+        <field name="Priority" type="byte" ver1="10.1.0.106" vercond="#BSSTREAM#">Idle animations tend to have low values for this, and high values tend to correspond with the important parts of the animations.</field>
         <!-- NiControllerSequence::IDTag, post-10.1.0.104 only -->
-        <add name="Node Name" type="string" ver1="10.1.0.104" ver2="10.1.0.113">The name of the animated NiAVObject.</add>
-        <add name="Property Type" type="string" ver1="10.1.0.104" ver2="10.1.0.113">The RTTI type of the NiProperty the controller is attached to, if applicable.</add>
-        <add name="Controller Type" type="string" ver1="10.1.0.104" ver2="10.1.0.113">The RTTI type of the NiTimeController.</add>
-        <add name="Controller ID" type="string" ver1="10.1.0.104" ver2="10.1.0.113">An ID that can uniquely identify the controller among others of the same type on the same NiObjectNET.</add>
-        <add name="Interpolator ID" type="string" ver1="10.1.0.104" ver2="10.1.0.113">An ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</add>
+        <field name="Node Name" type="string" ver1="10.1.0.104" ver2="10.1.0.113">The name of the animated NiAVObject.</field>
+        <field name="Property Type" type="string" ver1="10.1.0.104" ver2="10.1.0.113">The RTTI type of the NiProperty the controller is attached to, if applicable.</field>
+        <field name="Controller Type" type="string" ver1="10.1.0.104" ver2="10.1.0.113">The RTTI type of the NiTimeController.</field>
+        <field name="Controller ID" type="string" ver1="10.1.0.104" ver2="10.1.0.113">An ID that can uniquely identify the controller among others of the same type on the same NiObjectNET.</field>
+        <field name="Interpolator ID" type="string" ver1="10.1.0.104" ver2="10.1.0.113">An ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</field>
         <!-- From 10.2 to 20.1 -->
-        <add name="String Palette" type="Ref" template="NiStringPalette" ver1="10.2.0.0" ver2="20.1.0.0">Refers to the NiStringPalette which contains the name of the controlled NIF object.</add>
-        <add name="Node Name Offset" type="StringOffset" ver1="10.2.0.0" ver2="20.1.0.0">Offset in NiStringPalette to the name of the animated NiAVObject.</add>
-        <add name="Property Type Offset" type="StringOffset" ver1="10.2.0.0" ver2="20.1.0.0">Offset in NiStringPalette to the RTTI type of the NiProperty the controller is attached to, if applicable.</add>
-        <add name="Controller Type Offset" type="StringOffset" ver1="10.2.0.0" ver2="20.1.0.0">Offset in NiStringPalette to the RTTI type of the NiTimeController.</add>
-        <add name="Controller ID Offset" type="StringOffset" ver1="10.2.0.0" ver2="20.1.0.0">Offset in NiStringPalette to an ID that can uniquely identify the controller among others of the same type on the same NiObjectNET.</add>
-        <add name="Interpolator ID Offset" type="StringOffset" ver1="10.2.0.0" ver2="20.1.0.0">Offset in NiStringPalette to an ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</add>
+        <field name="String Palette" type="Ref" template="NiStringPalette" ver1="10.2.0.0" ver2="20.1.0.0">Refers to the NiStringPalette which contains the name of the controlled NIF object.</field>
+        <field name="Node Name Offset" type="StringOffset" ver1="10.2.0.0" ver2="20.1.0.0">Offset in NiStringPalette to the name of the animated NiAVObject.</field>
+        <field name="Property Type Offset" type="StringOffset" ver1="10.2.0.0" ver2="20.1.0.0">Offset in NiStringPalette to the RTTI type of the NiProperty the controller is attached to, if applicable.</field>
+        <field name="Controller Type Offset" type="StringOffset" ver1="10.2.0.0" ver2="20.1.0.0">Offset in NiStringPalette to the RTTI type of the NiTimeController.</field>
+        <field name="Controller ID Offset" type="StringOffset" ver1="10.2.0.0" ver2="20.1.0.0">Offset in NiStringPalette to an ID that can uniquely identify the controller among others of the same type on the same NiObjectNET.</field>
+        <field name="Interpolator ID Offset" type="StringOffset" ver1="10.2.0.0" ver2="20.1.0.0">Offset in NiStringPalette to an ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</field>
         <!-- After 20.1 -->
-        <add name="Node Name" type="string" ver1="20.1.0.1">The name of the animated NiAVObject.</add>
-        <add name="Property Type" type="string" ver1="20.1.0.1">The RTTI type of the NiProperty the controller is attached to, if applicable.</add>
-        <add name="Controller Type" type="string" ver1="20.1.0.1">The RTTI type of the NiTimeController.</add>
-        <add name="Controller ID" type="string" ver1="20.1.0.1">An ID that can uniquely identify the controller among others of the same type on the same NiObjectNET.</add>
-        <add name="Interpolator ID" type="string" ver1="20.1.0.1">An ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</add>
+        <field name="Node Name" type="string" ver1="20.1.0.1">The name of the animated NiAVObject.</field>
+        <field name="Property Type" type="string" ver1="20.1.0.1">The RTTI type of the NiProperty the controller is attached to, if applicable.</field>
+        <field name="Controller Type" type="string" ver1="20.1.0.1">The RTTI type of the NiTimeController.</field>
+        <field name="Controller ID" type="string" ver1="20.1.0.1">An ID that can uniquely identify the controller among others of the same type on the same NiObjectNET.</field>
+        <field name="Interpolator ID" type="string" ver1="20.1.0.1">An ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</field>
     </compound>
 
     <compound name="BSStreamHeader" versions="#BETHESDA#">
     	Information about how the file was exported
-        <add name="BS Version" type="ulittle32" />
-        <add name="Author" type="ExportString" />
-        <add name="Unknown Int" type="uint" cond="BS Version #GT# 130" />
-        <add name="Process Script" type="ExportString" />
-        <add name="Export Script" type="ExportString" />
-        <add name="Max Filepath" type="ExportString" cond="BS Version == 130" />
+        <field name="BS Version" type="ulittle32" />
+        <field name="Author" type="ExportString" />
+        <field name="Unknown Int" type="uint" cond="BS Version #GT# 130" />
+        <field name="Process Script" type="ExportString" />
+        <field name="Export Script" type="ExportString" />
+        <field name="Max Filepath" type="ExportString" cond="BS Version == 130" />
     </compound>
 
     <!-- Don't use vercond in Header, it breaks niflib -->
     <compound name="Header">
         The NIF file header.
-        <add name="Header String" type="HeaderString">'NetImmerse File Format x.x.x.x' (versions &lt;= 10.0.1.2) or 'Gamebryo File Format x.x.x.x' (versions &gt;= 10.1.0.0), with x.x.x.x the version written out. Ends with a newline character (0x0A).</add>
-        <add name="Copyright" type="LineString" arr1="3" ver2="3.1.0.0" />
-        <add name="Version" type="FileVersion" default="0x04000002" ver1="3.1.0.1">The NIF version, in hexadecimal notation: 0x04000002, 0x0401000C, 0x04020002, 0x04020100, 0x04020200, 0x0A000100, 0x0A010000, 0x0A020000, 0x14000004, ...</add>
-        <add name="Endian Type" type="EndianType" default="ENDIAN_LITTLE" ver1="20.0.0.3">Determines the endianness of the data in the file.</add>
-        <add name="User Version" type="ulittle32" ver1="10.0.1.8">An extra version number, for companies that decide to modify the file format.</add>
-        <add name="Num Blocks" type="ulittle32" ver1="3.1.0.1">Number of file objects.</add>
-        <add name="BS Header" type="BSStreamHeader" cond="#BSSTREAMHEADER#" />
-        <add name="Metadata" type="ByteArray" ver1="30.0.0.0" />
-        <add name="Num Block Types" type="ushort" ver1="5.0.0.1">Number of object types in this NIF file.</add>
-        <add name="Block Types" type="SizedString" arr1="Num Block Types" ver1="5.0.0.1" cond="Version != 20.3.1.2">List of all object types used in this NIF file.</add>
-        <add name="Block Type Hashes" type="uint" arr1="Num Block Types" ver1="20.3.1.2" ver2="20.3.1.2">List of all object types used in this NIF file.</add>
-        <add name="Block Type Index" type="BlockTypeIndex" arr1="Num Blocks" ver1="5.0.0.1">Maps file objects on their corresponding type: first file object is of type object_types[object_type_index[0]], the second of object_types[object_type_index[1]], etc.</add>
-        <add name="Block Size" type="uint" arr1="Num Blocks" ver1="20.2.0.5">Array of block sizes</add>
-        <add name="Num Strings" type="uint" ver1="20.1.0.1">Number of strings.</add>
-        <add name="Max String Length" type="uint" ver1="20.1.0.1">Maximum string length.</add>
-        <add name="Strings" type="SizedString" arr1="Num Strings" ver1="20.1.0.1">Strings.</add>
-        <add name="Num Groups" type="uint" default="0" ver1="5.0.0.6" />
-        <add name="Groups" type="uint" arr1="Num Groups" ver1="5.0.0.6" />
+        <field name="Header String" type="HeaderString">'NetImmerse File Format x.x.x.x' (versions &lt;= 10.0.1.2) or 'Gamebryo File Format x.x.x.x' (versions &gt;= 10.1.0.0), with x.x.x.x the version written out. Ends with a newline character (0x0A).</field>
+        <field name="Copyright" type="LineString" arr1="3" ver2="3.1.0.0" />
+        <field name="Version" type="FileVersion" default="0x04000002" ver1="3.1.0.1">The NIF version, in hexadecimal notation: 0x04000002, 0x0401000C, 0x04020002, 0x04020100, 0x04020200, 0x0A000100, 0x0A010000, 0x0A020000, 0x14000004, ...</field>
+        <field name="Endian Type" type="EndianType" default="ENDIAN_LITTLE" ver1="20.0.0.3">Determines the endianness of the data in the file.</field>
+        <field name="User Version" type="ulittle32" ver1="10.0.1.8">An extra version number, for companies that decide to modify the file format.</field>
+        <field name="Num Blocks" type="ulittle32" ver1="3.1.0.1">Number of file objects.</field>
+        <field name="BS Header" type="BSStreamHeader" cond="#BSSTREAMHEADER#" />
+        <field name="Metadata" type="ByteArray" ver1="30.0.0.0" />
+        <field name="Num Block Types" type="ushort" ver1="5.0.0.1">Number of object types in this NIF file.</field>
+        <field name="Block Types" type="SizedString" arr1="Num Block Types" ver1="5.0.0.1" cond="Version != 20.3.1.2">List of all object types used in this NIF file.</field>
+        <field name="Block Type Hashes" type="uint" arr1="Num Block Types" ver1="20.3.1.2" ver2="20.3.1.2">List of all object types used in this NIF file.</field>
+        <field name="Block Type Index" type="BlockTypeIndex" arr1="Num Blocks" ver1="5.0.0.1">Maps file objects on their corresponding type: first file object is of type object_types[object_type_index[0]], the second of object_types[object_type_index[1]], etc.</field>
+        <field name="Block Size" type="uint" arr1="Num Blocks" ver1="20.2.0.5">Array of block sizes</field>
+        <field name="Num Strings" type="uint" ver1="20.1.0.1">Number of strings.</field>
+        <field name="Max String Length" type="uint" ver1="20.1.0.1">Maximum string length.</field>
+        <field name="Strings" type="SizedString" arr1="Num Strings" ver1="20.1.0.1">Strings.</field>
+        <field name="Num Groups" type="uint" default="0" ver1="5.0.0.6" />
+        <field name="Groups" type="uint" arr1="Num Groups" ver1="5.0.0.6" />
     </compound>
 
     <compound name="StringPalette">
         A list of \\0 terminated strings.
-        <add name="Palette" type="SizedString">A bunch of 0x00 seperated strings.</add>
-        <add name="Length" type="uint">Length of the palette string is repeated here.</add>
+        <field name="Palette" type="SizedString">A bunch of 0x00 seperated strings.</field>
+        <field name="Length" type="uint">Length of the palette string is repeated here.</field>
     </compound>
 
     <compound name="TBC" size="12">
         Tension, bias, continuity.
-        <add name="t" type="float">Tension.</add>
-        <add name="b" type="float">Bias.</add>
-        <add name="c" type="float">Continuity.</add>
+        <field name="t" type="float">Tension.</field>
+        <field name="b" type="float">Bias.</field>
+        <field name="c" type="float">Continuity.</field>
     </compound>
 
     <compound name="Key" generic="true">
         A generic key with support for interpolation. Type 1 is normal linear interpolation, type 2 has forward and backward tangents, and type 3 has tension, bias and continuity arguments. Note that color4 and byte always seem to be of type 1.
-        <add name="Time" type="float">Time of the key.</add>
-        <add name="Value" type="#T#">The key value.</add>
-        <add name="Forward" type="#T#" cond="#ARG# == 2">Key forward tangent.</add>
-        <add name="Backward" type="#T#" cond="#ARG# == 2">The key backward tangent.</add>
-        <add name="TBC" type="TBC" cond="#ARG# == 3">The TBC of the key.</add>
+        <field name="Time" type="float">Time of the key.</field>
+        <field name="Value" type="#T#">The key value.</field>
+        <field name="Forward" type="#T#" cond="#ARG# == 2">Key forward tangent.</field>
+        <field name="Backward" type="#T#" cond="#ARG# == 2">The key backward tangent.</field>
+        <field name="TBC" type="TBC" cond="#ARG# == 3">The TBC of the key.</field>
     </compound>
 
     <compound name="KeyGroup" generic="true">
         Array of vector keys (anything that can be interpolated, except rotations).
-        <add name="Num Keys" type="uint">Number of keys in the array.</add>
-        <add name="Interpolation" type="KeyType" cond="Num Keys != 0">The key type.</add>
-        <add name="Keys" type="Key" arg="Interpolation" template="#T#" arr1="Num Keys">The keys.</add>
+        <field name="Num Keys" type="uint">Number of keys in the array.</field>
+        <field name="Interpolation" type="KeyType" cond="Num Keys != 0">The key type.</field>
+        <field name="Keys" type="Key" arg="Interpolation" template="#T#" arr1="Num Keys">The keys.</field>
     </compound>
 
     <compound name="QuatKey" generic="true">
         A special version of the key type used for quaternions. Never has tangents. #T# should always be Quaternion.
-        <add name="Time" type="float" ver2="10.1.0.0">Time the key applies.</add>
-        <add name="Time" type="float" cond="#ARG# != 4" ver1="10.1.0.106">Time the key applies.</add>
-        <add name="Value" type="#T#" cond="#ARG# != 4">Value of the key.</add>
-        <add name="TBC" type="TBC" cond="#ARG# == 3">The TBC of the key.</add>
+        <field name="Time" type="float" ver2="10.1.0.0">Time the key applies.</field>
+        <field name="Time" type="float" cond="#ARG# != 4" ver1="10.1.0.106">Time the key applies.</field>
+        <field name="Value" type="#T#" cond="#ARG# != 4">Value of the key.</field>
+        <field name="TBC" type="TBC" cond="#ARG# == 3">The TBC of the key.</field>
     </compound>
 
     <compound name="TexCoord" size="8">
         Texture coordinates (u,v). As in OpenGL; image origin is in the lower left corner.
-        <add name="u" type="float" range="#FPM_100#">First coordinate.</add>
-        <add name="v" type="float" range="#FPM_100#">Second coordinate.</add>
+        <field name="u" type="float" range="#FPM_100#">First coordinate.</field>
+        <field name="v" type="float" range="#FPM_100#">Second coordinate.</field>
     </compound>
     
     <compound name="HalfTexCoord" size="4">
         Texture coordinates (u,v).
-        <add name="u" type="hfloat" range="#FPM_10#">First coordinate.</add>
-        <add name="v" type="hfloat" range="#FPM_10#">Second coordinate.</add>
+        <field name="u" type="hfloat" range="#FPM_10#">First coordinate.</field>
+        <field name="v" type="hfloat" range="#FPM_10#">Second coordinate.</field>
     </compound>
     
     <enum name="TransformMethod" storage="uint" prefix="TM">
@@ -1957,37 +1957,37 @@
 
     <compound name="TexDesc">
         NiTexturingProperty::Map. Texture description.
-        <add name="Image" type="Ref" template="NiImage" ver2="3.1">Link to the texture image.</add>
-        <add name="Source" type="Ref" template="NiSourceTexture" ver1="3.3.0.13">NiSourceTexture object index.</add>
-        <add name="Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" ver2="20.0.0.5">0=clamp S clamp T, 1=clamp S wrap T, 2=wrap S clamp T, 3=wrap S wrap T</add>
-        <add name="Filter Mode" type="TexFilterMode" default="FILTER_TRILERP" ver2="20.0.0.5">0=nearest, 1=bilinear, 2=trilinear, 3=..., 4=..., 5=...</add>
-        <add name="Flags" type="TexturingMapFlags" ver1="20.1.0.3">Texture mode flags; clamp and filter mode stored in upper byte with 0xYZ00 = clamp mode Y, filter mode Z.</add>
-        <add name="Max Anisotropy" type="ushort" ver1="20.5.0.4" />
-        <add name="UV Set" type="uint" default="0" ver2="20.0.0.5">The texture coordinate set in NiGeometryData that this texture slot will use.</add>
-        <add name="PS2 L" type="short" default="0" ver2="10.4.0.1">L can range from 0 to 3 and are used to specify how fast a texture gets blurry.</add>
-        <add name="PS2 K" type="short" default="-75" ver2="10.4.0.1">K is used as an offset into the mipmap levels and can range from -2047 to 2047. Positive values push the mipmap towards being blurry and negative values make the mipmap sharper.</add>
-        <add name="Unknown Short 1" type="ushort" ver2="4.1.0.12" />
+        <field name="Image" type="Ref" template="NiImage" ver2="3.1">Link to the texture image.</field>
+        <field name="Source" type="Ref" template="NiSourceTexture" ver1="3.3.0.13">NiSourceTexture object index.</field>
+        <field name="Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" ver2="20.0.0.5">0=clamp S clamp T, 1=clamp S wrap T, 2=wrap S clamp T, 3=wrap S wrap T</field>
+        <field name="Filter Mode" type="TexFilterMode" default="FILTER_TRILERP" ver2="20.0.0.5">0=nearest, 1=bilinear, 2=trilinear, 3=..., 4=..., 5=...</field>
+        <field name="Flags" type="TexturingMapFlags" ver1="20.1.0.3">Texture mode flags; clamp and filter mode stored in upper byte with 0xYZ00 = clamp mode Y, filter mode Z.</field>
+        <field name="Max Anisotropy" type="ushort" ver1="20.5.0.4" />
+        <field name="UV Set" type="uint" default="0" ver2="20.0.0.5">The texture coordinate set in NiGeometryData that this texture slot will use.</field>
+        <field name="PS2 L" type="short" default="0" ver2="10.4.0.1">L can range from 0 to 3 and are used to specify how fast a texture gets blurry.</field>
+        <field name="PS2 K" type="short" default="-75" ver2="10.4.0.1">K is used as an offset into the mipmap levels and can range from -2047 to 2047. Positive values push the mipmap towards being blurry and negative values make the mipmap sharper.</field>
+        <field name="Unknown Short 1" type="ushort" ver2="4.1.0.12" />
         <!-- NiTextureTransform -->
-        <add name="Has Texture Transform" type="bool" default="false" ver1="10.1.0.0">Whether or not the texture coordinates are transformed.</add>
-        <add name="Translation" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0">The UV translation.</add>
-        <add name="Scale" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0" default="#VEC2_ONE#">The UV scale.</add>
-        <add name="Rotation" type="float" default="0.0" cond="Has Texture Transform" ver1="10.1.0.0">The W axis rotation in texture space.</add>
-        <add name="Transform Method" type="TransformMethod" cond="Has Texture Transform" ver1="10.1.0.0">Depending on the source, scaling can occur before or after rotation.</add>
-        <add name="Center" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0">The origin around which the texture rotates.</add>
+        <field name="Has Texture Transform" type="bool" default="false" ver1="10.1.0.0">Whether or not the texture coordinates are transformed.</field>
+        <field name="Translation" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0">The UV translation.</field>
+        <field name="Scale" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0" default="#VEC2_ONE#">The UV scale.</field>
+        <field name="Rotation" type="float" default="0.0" cond="Has Texture Transform" ver1="10.1.0.0">The W axis rotation in texture space.</field>
+        <field name="Transform Method" type="TransformMethod" cond="Has Texture Transform" ver1="10.1.0.0">Depending on the source, scaling can occur before or after rotation.</field>
+        <field name="Center" type="TexCoord" cond="Has Texture Transform" ver1="10.1.0.0">The origin around which the texture rotates.</field>
     </compound>
 
     <compound name="ShaderTexDesc">
         NiTexturingProperty::ShaderMap. Shader texture description.
-        <add name="Has Map" type="bool" />
-        <add name="Map" type="TexDesc" cond="Has Map" />
-        <add name="Map ID" type="uint" cond="Has Map">Unique identifier for the Gamebryo shader system.</add>
+        <field name="Has Map" type="bool" />
+        <field name="Map" type="TexDesc" cond="Has Map" />
+        <field name="Map ID" type="uint" cond="Has Map">Unique identifier for the Gamebryo shader system.</field>
     </compound>
 
     <compound name="Triangle" size="6">
         List of three vertex indices.
-        <add name="v1" type="ushort">First vertex index.</add>
-        <add name="v2" type="ushort">Second vertex index.</add>
-        <add name="v3" type="ushort">Third vertex index.</add>
+        <field name="v1" type="ushort">First vertex index.</field>
+        <field name="v2" type="ushort">Second vertex index.</field>
+        <field name="v3" type="ushort">Third vertex index.</field>
     </compound>
 
     <bitflags name="VertexAttribute" storage="ushort" prefix="VF" versions="#SSE# #FO4# #F76#">
@@ -2021,107 +2021,107 @@
     </bitfield>
 
 	<compound name="BSVertexData" versions="#SSE# #FO4# #F76#">
-		<add name="Vertex" type="Vector3" cond="(#ARG# #BITAND# 0x401) == 0x401" />
-		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x411) == 0x411" />
-		<add name="Unused W" type="uint" cond="(#ARG# #BITAND# 0x411) == 0x401" />
-
-		<add name="Vertex" type="HalfVector3" cond="(#ARG# #BITAND# 0x401) == 0x1" />
-		<add name="Bitangent X" type="hfloat" cond="(#ARG# #BITAND# 0x411) == 0x11" />
-		<add name="Unused W" type="ushort" cond="(#ARG# #BITAND# 0x411) == 0x1" />
-
-		<add name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x2" />
-		<add name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x8" />
-		<add name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x8" />
-		<add name="Tangent" type="ByteVector3" cond="(#ARG# #BITAND# 0x18) == 0x18" />
-		<add name="Bitangent Z" type="byte" cond="(#ARG# #BITAND# 0x18) == 0x18" />
-		<add name="Vertex Colors" type="ByteColor4" cond="#ARG# #BITAND# 0x20" />
-		<add name="Bone Weights" type="hfloat" arr1="4" cond="#ARG# #BITAND# 0x40" />
-		<add name="Bone Indices" type="byte" arr1="4" cond="#ARG# #BITAND# 0x40" />
-		<add name="Eye Data" type="float" cond="#ARG# #BITAND# 0x100" />
+		<field name="Vertex" type="Vector3" cond="(#ARG# #BITAND# 0x401) == 0x401" />
+		<field name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x411) == 0x411" />
+		<field name="Unused W" type="uint" cond="(#ARG# #BITAND# 0x411) == 0x401" />
+
+		<field name="Vertex" type="HalfVector3" cond="(#ARG# #BITAND# 0x401) == 0x1" />
+		<field name="Bitangent X" type="hfloat" cond="(#ARG# #BITAND# 0x411) == 0x11" />
+		<field name="Unused W" type="ushort" cond="(#ARG# #BITAND# 0x411) == 0x1" />
+
+		<field name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x2" />
+		<field name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x8" />
+		<field name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x8" />
+		<field name="Tangent" type="ByteVector3" cond="(#ARG# #BITAND# 0x18) == 0x18" />
+		<field name="Bitangent Z" type="byte" cond="(#ARG# #BITAND# 0x18) == 0x18" />
+		<field name="Vertex Colors" type="ByteColor4" cond="#ARG# #BITAND# 0x20" />
+		<field name="Bone Weights" type="hfloat" arr1="4" cond="#ARG# #BITAND# 0x40" />
+		<field name="Bone Indices" type="byte" arr1="4" cond="#ARG# #BITAND# 0x40" />
+		<field name="Eye Data" type="float" cond="#ARG# #BITAND# 0x100" />
 	</compound>
 
 	<compound name="BSVertexDataSSE" versions="#SSE# #FO4#">
-		<add name="Vertex" type="Vector3" cond="#ARG# #BITAND# 0x1" />
-		<add name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x11) == 0x11" />
-		<add name="Unused W" type="uint" cond="(#ARG# #BITAND# 0x11) == 0x1" />
-		<add name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x2" />
-		<add name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x8" />
-		<add name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x8" />
-		<add name="Tangent" type="ByteVector3" cond="(#ARG# #BITAND# 0x18) == 0x18" />
-		<add name="Bitangent Z" type="byte" cond="(#ARG# #BITAND# 0x18) == 0x18" />
-		<add name="Vertex Colors" type="ByteColor4" cond="#ARG# #BITAND# 0x20" />
-		<add name="Bone Weights" type="hfloat" arr1="4" cond="#ARG# #BITAND# 0x40" />
-		<add name="Bone Indices" type="byte" arr1="4" cond="#ARG# #BITAND# 0x40" />
-		<add name="Eye Data" type="float" cond="#ARG# #BITAND# 0x100" />
+		<field name="Vertex" type="Vector3" cond="#ARG# #BITAND# 0x1" />
+		<field name="Bitangent X" type="float" cond="(#ARG# #BITAND# 0x11) == 0x11" />
+		<field name="Unused W" type="uint" cond="(#ARG# #BITAND# 0x11) == 0x1" />
+		<field name="UV" type="HalfTexCoord" cond="#ARG# #BITAND# 0x2" />
+		<field name="Normal" type="ByteVector3" cond="#ARG# #BITAND# 0x8" />
+		<field name="Bitangent Y" type="byte" cond="#ARG# #BITAND# 0x8" />
+		<field name="Tangent" type="ByteVector3" cond="(#ARG# #BITAND# 0x18) == 0x18" />
+		<field name="Bitangent Z" type="byte" cond="(#ARG# #BITAND# 0x18) == 0x18" />
+		<field name="Vertex Colors" type="ByteColor4" cond="#ARG# #BITAND# 0x20" />
+		<field name="Bone Weights" type="hfloat" arr1="4" cond="#ARG# #BITAND# 0x40" />
+		<field name="Bone Indices" type="byte" arr1="4" cond="#ARG# #BITAND# 0x40" />
+		<field name="Eye Data" type="float" cond="#ARG# #BITAND# 0x100" />
 	</compound>
 
     <compound name="SkinPartition" since="V4_2_1_0">
         Skinning data for a submesh, optimized for hardware skinning. Part of NiSkinPartition.
-        <add name="Num Vertices" type="ushort">Number of vertices in this submesh.</add>
-        <add name="Num Triangles" type="ushort" calc="(#LEN2[Strips]# #GT# 0) #THEN# (#LEN2[Strips]# - 2) #ELSE# (#LEN[Triangles]#)">Number of triangles in this submesh.</add>
-        <add name="Num Bones" type="ushort">Number of bones influencing this submesh.</add>
-        <add name="Num Strips" type="ushort">Number of strips in this submesh (zero if not stripped).</add>
-        <add name="Num Weights Per Vertex" type="ushort" default="4">Number of weight coefficients per vertex. The Gamebryo engine seems to work well only if this number is equal to 4, even if there are less than 4 influences per vertex.</add>
-        <add name="Bones" type="ushort" arr1="Num Bones">List of bones.</add>
-        <add name="Has Vertex Map" type="bool" ver1="10.1.0.0">Do we have a vertex map?</add>
-        <add name="Vertex Map" type="ushort" arr1="Num Vertices" ver2="10.0.1.2">Maps the weight/influence lists in this submesh to the vertices in the shape being skinned.</add>
-        <add name="Vertex Map" type="ushort" arr1="Num Vertices" cond="Has Vertex Map" ver1="10.1.0.0">Maps the weight/influence lists in this submesh to the vertices in the shape being skinned.</add>
-        <add name="Has Vertex Weights" type="bool" ver1="10.1.0.0">Do we have vertex weights?</add>
-        <add name="Vertex Weights" type="float" arr1="Num Vertices" arr2="Num Weights Per Vertex" ver2="10.0.1.2">The vertex weights.</add>
-        <add name="Vertex Weights" type="float" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Vertex Weights" ver1="10.1.0.0">The vertex weights.</add>
-        <add name="Strip Lengths" type="ushort" arr1="Num Strips">The strip lengths.</add>
-        <add name="Has Faces" type="bool" calc="(#LEN[Strips]# #ADD# #LEN[Triangles]# #GT# 0) #THEN# 1 #ELSE# 0" ver1="10.1.0.0">Do we have triangle or strip data?</add>
-        <add name="Strips" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="Num Strips != 0" ver2="10.0.1.2">The strips.</add>
-        <add name="Strips" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="(Has Faces) #AND# (Num Strips != 0)" ver1="10.1.0.0">The strips.</add>
-        <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Num Strips == 0" ver2="10.0.1.2">The triangles.</add>
-        <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="(Has Faces) #AND# (Num Strips == 0)" ver1="10.1.0.0">The triangles.</add>
-        <add name="Has Bone Indices" type="bool">Do we have bone indices?</add>
-        <add name="Bone Indices" type="byte" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Bone Indices">Bone indices, they index into 'Bones'.</add>
-        <add name="LOD Level" type="byte" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
-        <add name="Global VB" type="bool" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
-		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
-		<add name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+        <field name="Num Vertices" type="ushort">Number of vertices in this submesh.</field>
+        <field name="Num Triangles" type="ushort" calc="(#LEN2[Strips]# #GT# 0) #THEN# (#LEN2[Strips]# - 2) #ELSE# (#LEN[Triangles]#)">Number of triangles in this submesh.</field>
+        <field name="Num Bones" type="ushort">Number of bones influencing this submesh.</field>
+        <field name="Num Strips" type="ushort">Number of strips in this submesh (zero if not stripped).</field>
+        <field name="Num Weights Per Vertex" type="ushort" default="4">Number of weight coefficients per vertex. The Gamebryo engine seems to work well only if this number is equal to 4, even if there are less than 4 influences per vertex.</field>
+        <field name="Bones" type="ushort" arr1="Num Bones">List of bones.</field>
+        <field name="Has Vertex Map" type="bool" ver1="10.1.0.0">Do we have a vertex map?</field>
+        <field name="Vertex Map" type="ushort" arr1="Num Vertices" ver2="10.0.1.2">Maps the weight/influence lists in this submesh to the vertices in the shape being skinned.</field>
+        <field name="Vertex Map" type="ushort" arr1="Num Vertices" cond="Has Vertex Map" ver1="10.1.0.0">Maps the weight/influence lists in this submesh to the vertices in the shape being skinned.</field>
+        <field name="Has Vertex Weights" type="bool" ver1="10.1.0.0">Do we have vertex weights?</field>
+        <field name="Vertex Weights" type="float" arr1="Num Vertices" arr2="Num Weights Per Vertex" ver2="10.0.1.2">The vertex weights.</field>
+        <field name="Vertex Weights" type="float" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Vertex Weights" ver1="10.1.0.0">The vertex weights.</field>
+        <field name="Strip Lengths" type="ushort" arr1="Num Strips">The strip lengths.</field>
+        <field name="Has Faces" type="bool" calc="(#LEN[Strips]# #ADD# #LEN[Triangles]# #GT# 0) #THEN# 1 #ELSE# 0" ver1="10.1.0.0">Do we have triangle or strip data?</field>
+        <field name="Strips" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="Num Strips != 0" ver2="10.0.1.2">The strips.</field>
+        <field name="Strips" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="(Has Faces) #AND# (Num Strips != 0)" ver1="10.1.0.0">The strips.</field>
+        <field name="Triangles" type="Triangle" arr1="Num Triangles" cond="Num Strips == 0" ver2="10.0.1.2">The triangles.</field>
+        <field name="Triangles" type="Triangle" arr1="Num Triangles" cond="(Has Faces) #AND# (Num Strips == 0)" ver1="10.1.0.0">The triangles.</field>
+        <field name="Has Bone Indices" type="bool">Do we have bone indices?</field>
+        <field name="Bone Indices" type="byte" arr1="Num Vertices" arr2="Num Weights Per Vertex" cond="Has Bone Indices">Bone indices, they index into 'Bones'.</field>
+        <field name="LOD Level" type="byte" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <field name="Global VB" type="bool" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+		<field name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<field name="Triangles Copy" type="Triangle" arr1="Num Triangles" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
     </compound>
 
     <compound name="NiPlane" size="16">
         A plane.
-        <add name="Normal" type="Vector3">The plane normal.</add>
-        <add name="Constant" type="float">The plane constant.</add>
+        <field name="Normal" type="Vector3">The plane normal.</field>
+        <field name="Constant" type="float">The plane constant.</field>
     </compound>
 
     <compound name="NiBoundAABB" size="26">
         Divinity 2 specific NiBound extension.
-        <add name="Num Corners" type="ushort" default="2" />
-        <add name="Corners" type="Vector3" arr1="2">Corners are only non-zero if Num Corners is 2. Hardcoded to 2.</add>
+        <field name="Num Corners" type="ushort" default="2" />
+        <field name="Corners" type="Vector3" arr1="2">Corners are only non-zero if Num Corners is 2. Hardcoded to 2.</field>
     </compound>
 
     <compound name="NiBound">
         A sphere.
-        <add name="Center" type="Vector3">The sphere's center.</add>
-        <add name="Radius" type="float">The sphere's radius.</add>
-        <add name="DIV2 AABB" type="NiBoundAABB" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
+        <field name="Center" type="Vector3">The sphere's center.</field>
+        <field name="Radius" type="float">The sphere's radius.</field>
+        <field name="DIV2 AABB" type="NiBoundAABB" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
     </compound>
 
     <compound name="NiCurve3">
         A 3D curve made up of control points and knots.
-        <add name="Degree" type="uint" />
-        <add name="Num Control Points" type="uint" />
-        <add name="Control Points" type="Vector3" arr1="Num Control Points" />
-        <add name="Num Knots" type="uint" />
-        <add name="Knots" type="float" arr1="Num Knots" />
+        <field name="Degree" type="uint" />
+        <field name="Num Control Points" type="uint" />
+        <field name="Control Points" type="Vector3" arr1="Num Control Points" />
+        <field name="Num Knots" type="uint" />
+        <field name="Knots" type="float" arr1="Num Knots" />
     </compound>
 
     <compound name="NiQuatTransform">
-        <add name="Translation" type="Vector3" />
-        <add name="Rotation" type="Quaternion" />
-        <add name="Scale" type="float" default="1.0" />
-        <add name="TRS Valid" type="bool" arr1="3" ver2="10.1.0.109">Whether each transform component is valid.</add>
+        <field name="Translation" type="Vector3" />
+        <field name="Rotation" type="Quaternion" />
+        <field name="Scale" type="float" default="1.0" />
+        <field name="TRS Valid" type="bool" arr1="3" ver2="10.1.0.109">Whether each transform component is valid.</field>
     </compound>
 
     <compound name="NiTransform" size="52">
-        <add name="Rotation" type="Matrix33">The rotation part of the transformation matrix.</add>
-        <add name="Translation" type="Vector3">The translation vector.</add>
-        <add name="Scale" type="float" default="1.0">Scaling part (only uniform scaling is supported).</add>
+        <field name="Rotation" type="Matrix33">The rotation part of the transformation matrix.</field>
+        <field name="Translation" type="Vector3">The translation vector.</field>
+        <field name="Scale" type="float" default="1.0">Scaling part (only uniform scaling is supported).</field>
     </compound>
 
 	<bitflags name="FurnitureEntryPoints" storage="ushort" versions="#BETHESDA#">
@@ -2142,81 +2142,81 @@
 
     <compound name="FurniturePosition" versions="#BETHESDA#">
         Bethesda Animation. Describes a furniture position?
-        <add name="Offset" type="Vector3">Offset of furniture marker.</add>
-        <add name="Orientation" type="ushort" vercond="#NI_BS_LTE_FO3#">Furniture marker orientation.</add>
-        <add name="Position Ref 1" type="byte" vercond="#NI_BS_LTE_FO3#">Refers to a furnituremarkerxx.nif file. Always seems to be the same as Position Ref 2.</add>
-        <add name="Position Ref 2" type="byte" vercond="#NI_BS_LTE_FO3#">Refers to a furnituremarkerxx.nif file. Always seems to be the same as Position Ref 1.</add>
-        <add name="Heading" type="float" vercond="#BS_GT_FO3#">Similar to Orientation, in float form.</add>
-        <add name="Animation Type" type="AnimationType" vercond="#BS_GT_FO3#" />
-        <add name="Entry Properties" type="FurnitureEntryPoints" vercond="#BS_GT_FO3#" />
+        <field name="Offset" type="Vector3">Offset of furniture marker.</field>
+        <field name="Orientation" type="ushort" vercond="#NI_BS_LTE_FO3#">Furniture marker orientation.</field>
+        <field name="Position Ref 1" type="byte" vercond="#NI_BS_LTE_FO3#">Refers to a furnituremarkerxx.nif file. Always seems to be the same as Position Ref 2.</field>
+        <field name="Position Ref 2" type="byte" vercond="#NI_BS_LTE_FO3#">Refers to a furnituremarkerxx.nif file. Always seems to be the same as Position Ref 1.</field>
+        <field name="Heading" type="float" vercond="#BS_GT_FO3#">Similar to Orientation, in float form.</field>
+        <field name="Animation Type" type="AnimationType" vercond="#BS_GT_FO3#" />
+        <field name="Entry Properties" type="FurnitureEntryPoints" vercond="#BS_GT_FO3#" />
     </compound>
 
     <compound name="TriangleData" versions="#BETHESDA#">
         Bethesda Havok. A triangle with extra data used for physics.
-        <add name="Triangle" type="Triangle">The triangle.</add>
-        <add name="Welding Info" type="ushort">Additional havok information on how triangles are welded.</add>
-        <add name="Normal" type="Vector3" ver2="20.0.0.5">This is the triangle's normal.</add>
+        <field name="Triangle" type="Triangle">The triangle.</field>
+        <field name="Welding Info" type="ushort">Additional havok information on how triangles are welded.</field>
+        <field name="Normal" type="Vector3" ver2="20.0.0.5">This is the triangle's normal.</field>
     </compound>
 
     <compound name="Morph">
         Geometry morphing data component.
-        <add name="Frame Name" type="string" ver1="10.1.0.106">Name of the frame.</add>
-        <add name="Num Keys" type="uint" ver2="10.1.0.0">The number of morph keys that follow.</add>
-        <add name="Interpolation" type="KeyType" ver2="10.1.0.0">Unlike most objects, the presense of this value is not conditional on there being keys.</add>
-        <add name="Keys" type="Key" arg="Interpolation" template="float" arr1="Num Keys" ver2="10.1.0.0">The morph key frames.</add>
-        <add name="Legacy Weight" type="float" ver1="10.1.0.104" ver2="20.1.0.2" vercond="#BSVER# #LT# 10" />
-        <add name="Vectors" type="Vector3" arr1="#ARG#">Morph vectors.</add>
+        <field name="Frame Name" type="string" ver1="10.1.0.106">Name of the frame.</field>
+        <field name="Num Keys" type="uint" ver2="10.1.0.0">The number of morph keys that follow.</field>
+        <field name="Interpolation" type="KeyType" ver2="10.1.0.0">Unlike most objects, the presense of this value is not conditional on there being keys.</field>
+        <field name="Keys" type="Key" arg="Interpolation" template="float" arr1="Num Keys" ver2="10.1.0.0">The morph key frames.</field>
+        <field name="Legacy Weight" type="float" ver1="10.1.0.104" ver2="20.1.0.2" vercond="#BSVER# #LT# 10" />
+        <field name="Vectors" type="Vector3" arr1="#ARG#">Morph vectors.</field>
     </compound>
 
     <compound name="NiParticleInfo" size="40">
         Called NiPerParticleData in NiOldParticles.
         Holds the state of a particle at the time the system was saved.
-        <add name="Velocity" type="Vector3">Particle direction and speed.</add>
-        <add name="Rotation Axis" type="Vector3" ver2="10.4.0.1" />
-        <add name="Age" type="float" />
-        <add name="Life Span" type="float" />
-        <add name="Last Update" type="float">Timestamp of the last update.</add>
-        <add name="Spawn Generation" type="ushort" default="0" />
-        <add name="Code" type="ushort">Usually matches array index</add>
+        <field name="Velocity" type="Vector3">Particle direction and speed.</field>
+        <field name="Rotation Axis" type="Vector3" ver2="10.4.0.1" />
+        <field name="Age" type="float" />
+        <field name="Life Span" type="float" />
+        <field name="Last Update" type="float">Timestamp of the last update.</field>
+        <field name="Spawn Generation" type="ushort" default="0" />
+        <field name="Code" type="ushort">Usually matches array index</field>
     </compound>
 
     <compound name="BoneData">
         NiSkinData::BoneData. Skinning data component.
-        <add name="Skin Transform" type="NiTransform">Offset of the skin from this bone in bind position.</add>
-        <add name="Bounding Sphere" type="NiBound">Note that its a Sphere Containing Axis Aligned Box not a minimum volume Sphere</add>
-        <add name="Num Vertices" type="ushort">Number of weighted vertices.</add>
-        <add name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver2="4.2.1.0">The vertex weights.</add>
-        <add name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver1="4.2.2.0" cond="#ARG# != 0">The vertex weights.</add>
+        <field name="Skin Transform" type="NiTransform">Offset of the skin from this bone in bind position.</field>
+        <field name="Bounding Sphere" type="NiBound">Note that its a Sphere Containing Axis Aligned Box not a minimum volume Sphere</field>
+        <field name="Num Vertices" type="ushort">Number of weighted vertices.</field>
+        <field name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver2="4.2.1.0">The vertex weights.</field>
+        <field name="Vertex Weights" type="BoneVertData" arr1="Num Vertices" ver1="4.2.2.0" cond="#ARG# != 0">The vertex weights.</field>
     </compound>
 
     <compound name="HavokFilter" size="4" versions="#BETHESDA#">
         Bethesda Havok. Collision filter info representing Layer, Flags, Part Number, and Group all combined into one uint.
-        <add name="Layer" suffix="OB" type="OblivionLayer" default="OL_STATIC" ver2="20.0.0.5" vercond="#BSVER# #LT# 16">The layer the collision belongs to.</add>
-        <add name="Layer" suffix="FO" type="Fallout3Layer" default="FOL_STATIC" vercond="(#VER# == 20.2.0.7) #AND# #NI_BS_LTE_FO3#">The layer the collision belongs to.</add>
-        <add name="Layer" suffix="SK" type="SkyrimLayer" default="SKYL_STATIC" vercond="(#VER# == 20.2.0.7) #AND# #BS_GT_FO3#">The layer the collision belongs to.</add>
-        <add name="Flags" type="CollisionFilterFlags" default="0" />
-        <add name="Group" type="ushort" />
+        <field name="Layer" suffix="OB" type="OblivionLayer" default="OL_STATIC" ver2="20.0.0.5" vercond="#BSVER# #LT# 16">The layer the collision belongs to.</field>
+        <field name="Layer" suffix="FO" type="Fallout3Layer" default="FOL_STATIC" vercond="(#VER# == 20.2.0.7) #AND# #NI_BS_LTE_FO3#">The layer the collision belongs to.</field>
+        <field name="Layer" suffix="SK" type="SkyrimLayer" default="SKYL_STATIC" vercond="(#VER# == 20.2.0.7) #AND# #BS_GT_FO3#">The layer the collision belongs to.</field>
+        <field name="Flags" type="CollisionFilterFlags" default="0" />
+        <field name="Group" type="ushort" />
     </compound>
 
     <compound name="HavokMaterial" versions="#BETHESDA#">
         Bethesda Havok. Material wrapper for varying material enums by game.
-        <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
-        <add name="Material" suffix="OB" type="OblivionHavokMaterial" ver2="20.0.0.5" vercond="#BSVER# #LT# 16">The material of the shape.</add>
-        <add name="Material" suffix="FO" type="Fallout3HavokMaterial" vercond="(#VER# == 20.2.0.7) #AND# #NI_BS_LTE_FO3#">The material of the shape.</add>
-        <add name="Material" suffix="SK" type="SkyrimHavokMaterial" vercond="(#VER# == 20.2.0.7) #AND# #BS_GT_FO3#">The material of the shape.</add>
+        <field name="Unknown Int" type="uint" ver2="10.0.1.2" />
+        <field name="Material" suffix="OB" type="OblivionHavokMaterial" ver2="20.0.0.5" vercond="#BSVER# #LT# 16">The material of the shape.</field>
+        <field name="Material" suffix="FO" type="Fallout3HavokMaterial" vercond="(#VER# == 20.2.0.7) #AND# #NI_BS_LTE_FO3#">The material of the shape.</field>
+        <field name="Material" suffix="SK" type="SkyrimHavokMaterial" vercond="(#VER# == 20.2.0.7) #AND# #BS_GT_FO3#">The material of the shape.</field>
     </compound>
 
     <compound name="hkSubPartData" versions="#BETHESDA#">
         Bethesda Havok. Havok Information for packed TriStrip shapes.
-        <add name="Havok Filter" type="HavokFilter" />
-        <add name="Num Vertices" type="uint">The number of vertices that form this sub shape.</add>
-        <add name="Material" type="HavokMaterial">The material of the subshape.</add>
+        <field name="Havok Filter" type="HavokFilter" />
+        <field name="Num Vertices" type="uint">The number of vertices that form this sub shape.</field>
+        <field name="Material" type="HavokMaterial">The material of the subshape.</field>
     </compound>
 
     <compound name="hkAabb" versions="#BETHESDA#">
         Havok AABB using min/max coordinates instead of center/half extents.
-        <add name="Min" type="Vector4">Coordinates of the corner with the lowest numerical values.</add>
-        <add name="Max" type="Vector4">Coordinates of the corner with the highest numerical values.</add>
+        <field name="Min" type="Vector4">Coordinates of the corner with the lowest numerical values.</field>
+        <field name="Max" type="Vector4">Coordinates of the corner with the highest numerical values.</field>
     </compound>
 
     <enum name="ConstraintPriority" storage="uint" versions="#BETHESDA#">
@@ -2229,50 +2229,50 @@
 
     <compound name="bhkConstraintCInfo" size="16" versions="#BETHESDA#">
         Bethesda extension of hkpConstraintInstance.
-        <add name="Num Entities" type="uint" default="2">Always 2 (Hardcoded). Number of bodies affected by this constraint.</add>
-        <add name="Entity A" type="Ptr" template="bhkEntity">The entity affected by this constraint.</add>
-        <add name="Entity B" type="Ptr" template="bhkEntity">The entity affected by this constraint.</add>
-        <add name="Priority" type="ConstraintPriority" default="PRIORITY_PSI">Either PSI or TOI priority. TOI is higher priority.</add>
+        <field name="Num Entities" type="uint" default="2">Always 2 (Hardcoded). Number of bodies affected by this constraint.</field>
+        <field name="Entity A" type="Ptr" template="bhkEntity">The entity affected by this constraint.</field>
+        <field name="Entity B" type="Ptr" template="bhkEntity">The entity affected by this constraint.</field>
+        <field name="Priority" type="ConstraintPriority" default="PRIORITY_PSI">Either PSI or TOI priority. TOI is higher priority.</field>
     </compound>
 
     <compound name="bhkConstraintChainCInfo" versions="#BETHESDA#">
         Bethesda extension of hkpConstraintChainInstance.
-        <add name="Num Chained Entities" type="uint" />
-        <add name="Chained Entities" type="Ptr" template="bhkRigidBody" arr1="Num Chained Entities" />
-        <add name="Constraint Info" type="bhkConstraintCInfo" />
+        <field name="Num Chained Entities" type="uint" />
+        <field name="Chained Entities" type="Ptr" template="bhkRigidBody" arr1="Num Chained Entities" />
+        <field name="Constraint Info" type="bhkConstraintCInfo" />
     </compound>
 
     <compound name="bhkPositionConstraintMotor" size="25" versions="#BETHESDA#">
         Bethesda extension of hkpPositionConstraintMotor.
         A motor which tries to reach a desired position/angle given a max force and recovery speed.
         This motor is a good choice for driving a ragdoll to a given pose.
-        <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
-        <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
-        <add name="Tau" type="float" default="0.8">Relative stiffness</add>
-        <add name="Damping" type="float" default="1.0">Motor damping value</add>
-        <add name="Proportional Recovery Velocity" type="float" default="2.0">A factor of the current error to calculate the recovery velocity</add>
-        <add name="Constant Recovery Velocity" type="float" default="1.0">A constant velocity which is used to recover from errors</add>
-        <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
+        <field name="Min Force" type="float" default="-1000000.0">Minimum motor force</field>
+        <field name="Max Force" type="float" default="1000000.0">Maximum motor force</field>
+        <field name="Tau" type="float" default="0.8">Relative stiffness</field>
+        <field name="Damping" type="float" default="1.0">Motor damping value</field>
+        <field name="Proportional Recovery Velocity" type="float" default="2.0">A factor of the current error to calculate the recovery velocity</field>
+        <field name="Constant Recovery Velocity" type="float" default="1.0">A constant velocity which is used to recover from errors</field>
+        <field name="Motor Enabled" type="bool" default="0">Is Motor enabled</field>
     </compound>
 
     <compound name="bhkVelocityConstraintMotor" size="18" versions="#BETHESDA#">
         Bethesda extension of hkpVelocityConstraintMotor. Tries to reach and keep a desired target velocity.
-        <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
-        <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
-        <add name="Tau" type="float" default="0.0">Relative stiffness</add>
-        <add name="Target Velocity" type="float" default="0.0" />
-        <add name="Use Velocity Target" type="bool" default="0" />
-        <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
+        <field name="Min Force" type="float" default="-1000000.0">Minimum motor force</field>
+        <field name="Max Force" type="float" default="1000000.0">Maximum motor force</field>
+        <field name="Tau" type="float" default="0.0">Relative stiffness</field>
+        <field name="Target Velocity" type="float" default="0.0" />
+        <field name="Use Velocity Target" type="bool" default="0" />
+        <field name="Motor Enabled" type="bool" default="0">Is Motor enabled</field>
     </compound>
 
     <compound name="bhkSpringDamperConstraintMotor" size="17" versions="#BETHESDA#">
         Bethesda extension of hkpSpringDamperConstraintMotor.
         Tries to reach a given target position using an angular spring which has a spring constant.
-        <add name="Min Force" type="float" default="-1000000.0">Minimum motor force</add>
-        <add name="Max Force" type="float" default="1000000.0">Maximum motor force</add>
-        <add name="Spring Constant" type="float" default="0.0">The spring constant in N/m</add>
-        <add name="Spring Damping" type="float" default="0.0">The spring damping in Nsec/m</add>
-        <add name="Motor Enabled" type="bool" default="0">Is Motor enabled</add>
+        <field name="Min Force" type="float" default="-1000000.0">Minimum motor force</field>
+        <field name="Max Force" type="float" default="1000000.0">Maximum motor force</field>
+        <field name="Spring Constant" type="float" default="0.0">The spring constant in N/m</field>
+        <field name="Spring Damping" type="float" default="0.0">The spring damping in Nsec/m</field>
+        <field name="Motor Enabled" type="bool" default="0">Is Motor enabled</field>
     </compound>
     
     <enum name="hkMotorType" storage="byte" versions="#BETHESDA#">
@@ -2284,41 +2284,41 @@
 
     <compound name="bhkConstraintMotorCInfo" versions="#BETHESDA#">
         hkConstraintCinfo::SaveMotor(). Not a Bethesda extension of hkpConstraintMotor, but a wrapper for its serialization function. 
-        <add name="Type" type="hkMotorType" default="MOTOR_NONE" />
-        <add name="Position Motor" type="bhkPositionConstraintMotor" cond="Type == 1" />
-        <add name="Velocity Motor" type="bhkVelocityConstraintMotor" cond="Type == 2" />
-        <add name="Spring Damper Motor" type="bhkSpringDamperConstraintMotor" cond="Type == 3" />
+        <field name="Type" type="hkMotorType" default="MOTOR_NONE" />
+        <field name="Position Motor" type="bhkPositionConstraintMotor" cond="Type == 1" />
+        <field name="Velocity Motor" type="bhkVelocityConstraintMotor" cond="Type == 2" />
+        <field name="Spring Damper Motor" type="bhkSpringDamperConstraintMotor" cond="Type == 3" />
     </compound>
 
     <compound name="bhkRagdollConstraintCInfo" versions="#BETHESDA#">
         Serialization data for bhkRagdollConstraint.
         The area of movement can be represented as a main cone + 2 orthogonal cones which may subtract from the main cone volume depending on limits.
         <!-- Oblivion and Fallout 3, Havok 550 -->
-        <add name="Pivot A" type="Vector4" vercond="#NI_BS_LTE_16#">The point where the constraint is attached to its parent rigidbody.</add>
-        <add name="Plane A" type="Vector4" vercond="#NI_BS_LTE_16#">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</add>
-        <add name="Twist A" type="Vector4" vercond="#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane A.</add>
-        <add name="Pivot B" type="Vector4" vercond="#NI_BS_LTE_16#">The point where the constraint is attached to the other rigidbody.</add>
-        <add name="Plane B" type="Vector4" vercond="#NI_BS_LTE_16#">Defines the orthogonal plane in which the shape can be controlled (the direction orthogonal on this one and Twist B).</add>
-        <add name="Twist B" type="Vector4" vercond="#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane B.</add>
+        <field name="Pivot A" type="Vector4" vercond="#NI_BS_LTE_16#">The point where the constraint is attached to its parent rigidbody.</field>
+        <field name="Plane A" type="Vector4" vercond="#NI_BS_LTE_16#">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</field>
+        <field name="Twist A" type="Vector4" vercond="#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane A.</field>
+        <field name="Pivot B" type="Vector4" vercond="#NI_BS_LTE_16#">The point where the constraint is attached to the other rigidbody.</field>
+        <field name="Plane B" type="Vector4" vercond="#NI_BS_LTE_16#">Defines the orthogonal plane in which the shape can be controlled (the direction orthogonal on this one and Twist B).</field>
+        <field name="Twist B" type="Vector4" vercond="#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane B.</field>
 
         <!-- Fallout 3 and later, Havok 660 and 2010 -->
-        <add name="Twist A" type="Vector4" vercond="!#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane A.</add>
-        <add name="Plane A" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</add>
-        <add name="Motor A" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
-        <add name="Pivot A" type="Vector4" vercond="!#NI_BS_LTE_16#">Point around which the object will rotate. Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
-        <add name="Twist B" type="Vector4" vercond="!#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane B.</add>
-        <add name="Plane B" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</add>
-        <add name="Motor B" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
-        <add name="Pivot B" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</add>
+        <field name="Twist A" type="Vector4" vercond="!#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane A.</field>
+        <field name="Plane A" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</field>
+        <field name="Motor A" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</field>
+        <field name="Pivot A" type="Vector4" vercond="!#NI_BS_LTE_16#">Point around which the object will rotate. Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</field>
+        <field name="Twist B" type="Vector4" vercond="!#NI_BS_LTE_16#">Central directed axis of the cone in which the object can rotate. Orthogonal on Plane B.</field>
+        <field name="Plane B" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal plane in which the body can move, the orthogonal directions in which the shape can be controlled (the direction orthogonal on this one and Twist A).</field>
+        <field name="Motor B" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</field>
+        <field name="Pivot B" type="Vector4" vercond="!#NI_BS_LTE_16#">Defines the orthogonal directions in which the shape can be controlled (namely in this direction, and in the direction orthogonal on this one and Twist A).</field>
 
-        <add name="Cone Max Angle" type="float">Maximum angle the object can rotate around the vector orthogonal on Plane A and Twist A relative to the Twist A vector. Note that Cone Min Angle is not stored, but is simply minus this angle.</add>
-        <add name="Plane Min Angle" type="float">Minimum angle the object can rotate around Plane A, relative to Twist A.</add>
-        <add name="Plane Max Angle" type="float">Maximum angle the object can rotate around Plane A, relative to Twist A.</add>
-        <add name="Twist Min Angle" type="float">Minimum angle the object can rotate around Twist A, relative to Plane A.</add>
-        <add name="Twist Max Angle" type="float">Maximum angle the object can rotate around Twist A, relative to Plane A.</add>
-        <add name="Max Friction" type="float">Maximum friction, typically 0 or 10. In Fallout 3, typically 100.</add>
+        <field name="Cone Max Angle" type="float">Maximum angle the object can rotate around the vector orthogonal on Plane A and Twist A relative to the Twist A vector. Note that Cone Min Angle is not stored, but is simply minus this angle.</field>
+        <field name="Plane Min Angle" type="float">Minimum angle the object can rotate around Plane A, relative to Twist A.</field>
+        <field name="Plane Max Angle" type="float">Maximum angle the object can rotate around Plane A, relative to Twist A.</field>
+        <field name="Twist Min Angle" type="float">Minimum angle the object can rotate around Twist A, relative to Plane A.</field>
+        <field name="Twist Max Angle" type="float">Maximum angle the object can rotate around Twist A, relative to Plane A.</field>
+        <field name="Max Friction" type="float">Maximum friction, typically 0 or 10. In Fallout 3, typically 100.</field>
 
-        <add name="Motor" type="bhkConstraintMotorCInfo" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
+        <field name="Motor" type="bhkConstraintMotorCInfo" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
     </compound>
 
     <compound name="bhkLimitedHingeConstraintCInfo" versions="#BETHESDA#">
@@ -2326,57 +2326,57 @@
         This constraint allows rotation about a specified axis, limited by specified boundaries.
     
         <!-- Oblivion and Fallout 3, Havok 550 -->
-        <add name="Pivot A" type="Vector4" vercond="#NI_BS_LTE_16#">Pivot point around which the object will rotate.</add>
-        <add name="Axis A" type="Vector4" vercond="#NI_BS_LTE_16#">Axis of rotation.</add>
-        <add name="Perp Axis In A1" type="Vector4" vercond="#NI_BS_LTE_16#">Vector in the rotation plane which defines the zero angle.</add>
-        <add name="Perp Axis In A2" type="Vector4" vercond="#NI_BS_LTE_16#">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</add>
-        <add name="Pivot B" type="Vector4" vercond="#NI_BS_LTE_16#">Pivot A in second entity coordinate system.</add>
-        <add name="Axis B" type="Vector4" vercond="#NI_BS_LTE_16#">Axis A in second entity coordinate system.</add>
-        <add name="Perp Axis In B2" type="Vector4" vercond="#NI_BS_LTE_16#">Perp Axis In A2 in second entity coordinate system.</add>
+        <field name="Pivot A" type="Vector4" vercond="#NI_BS_LTE_16#">Pivot point around which the object will rotate.</field>
+        <field name="Axis A" type="Vector4" vercond="#NI_BS_LTE_16#">Axis of rotation.</field>
+        <field name="Perp Axis In A1" type="Vector4" vercond="#NI_BS_LTE_16#">Vector in the rotation plane which defines the zero angle.</field>
+        <field name="Perp Axis In A2" type="Vector4" vercond="#NI_BS_LTE_16#">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</field>
+        <field name="Pivot B" type="Vector4" vercond="#NI_BS_LTE_16#">Pivot A in second entity coordinate system.</field>
+        <field name="Axis B" type="Vector4" vercond="#NI_BS_LTE_16#">Axis A in second entity coordinate system.</field>
+        <field name="Perp Axis In B2" type="Vector4" vercond="#NI_BS_LTE_16#">Perp Axis In A2 in second entity coordinate system.</field>
 
         <!-- Fallout 3 and later, Havok 660 and 2010
              In reality Havok loads these as Transform A and Transform B using hkTransform -->
-        <add name="Axis A" type="Vector4" vercond="!#NI_BS_LTE_16#">Axis of rotation.</add>
-        <add name="Perp Axis In A1" type="Vector4" vercond="!#NI_BS_LTE_16#">Vector in the rotation plane which defines the zero angle.</add>
-        <add name="Perp Axis In A2" type="Vector4" vercond="!#NI_BS_LTE_16#">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</add>
-        <add name="Pivot A" type="Vector4" vercond="!#NI_BS_LTE_16#">Pivot point around which the object will rotate.</add>
-        <add name="Axis B" type="Vector4" vercond="!#NI_BS_LTE_16#">Axis A in second entity coordinate system.</add>
-        <add name="Perp Axis In B1" type="Vector4" vercond="!#NI_BS_LTE_16#">Perp Axis In A1 in second entity coordinate system.</add>
-        <add name="Perp Axis In B2" type="Vector4" vercond="!#NI_BS_LTE_16#">Perp Axis In A2 in second entity coordinate system.</add>
-        <add name="Pivot B" type="Vector4" vercond="!#NI_BS_LTE_16#">Pivot A in second entity coordinate system.</add>
+        <field name="Axis A" type="Vector4" vercond="!#NI_BS_LTE_16#">Axis of rotation.</field>
+        <field name="Perp Axis In A1" type="Vector4" vercond="!#NI_BS_LTE_16#">Vector in the rotation plane which defines the zero angle.</field>
+        <field name="Perp Axis In A2" type="Vector4" vercond="!#NI_BS_LTE_16#">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</field>
+        <field name="Pivot A" type="Vector4" vercond="!#NI_BS_LTE_16#">Pivot point around which the object will rotate.</field>
+        <field name="Axis B" type="Vector4" vercond="!#NI_BS_LTE_16#">Axis A in second entity coordinate system.</field>
+        <field name="Perp Axis In B1" type="Vector4" vercond="!#NI_BS_LTE_16#">Perp Axis In A1 in second entity coordinate system.</field>
+        <field name="Perp Axis In B2" type="Vector4" vercond="!#NI_BS_LTE_16#">Perp Axis In A2 in second entity coordinate system.</field>
+        <field name="Pivot B" type="Vector4" vercond="!#NI_BS_LTE_16#">Pivot A in second entity coordinate system.</field>
 
-        <add name="Min Angle" type="float">Minimum rotation angle.</add>
-        <add name="Max Angle" type="float">Maximum rotation angle.</add>
-        <add name="Max Friction" type="float">Maximum friction, typically either 0 or 10. In Fallout 3, typically 100.</add>
+        <field name="Min Angle" type="float">Minimum rotation angle.</field>
+        <field name="Max Angle" type="float">Maximum rotation angle.</field>
+        <field name="Max Friction" type="float">Maximum friction, typically either 0 or 10. In Fallout 3, typically 100.</field>
 
-        <add name="Motor" type="bhkConstraintMotorCInfo" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
+        <field name="Motor" type="bhkConstraintMotorCInfo" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
     </compound>
 
     <compound name="bhkHingeConstraintCInfo" versions="#BETHESDA#">
         Serialization data for bhkHingeConstraint. A basic hinge with no angular limits or motor.
         <!-- Oblivion -->
-        <add name="Pivot A" type="Vector4" ver2="20.0.0.5">Pivot point around which the object will rotate.</add>
-        <add name="Perp Axis In A1" type="Vector4" ver2="20.0.0.5">Vector in the rotation plane which defines the zero angle.</add>
-        <add name="Perp Axis In A2" type="Vector4" ver2="20.0.0.5">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation.</add>
-        <add name="Pivot B" type="Vector4" ver2="20.0.0.5">Pivot A in second entity coordinate system.</add>
-        <add name="Axis B" type="Vector4" ver2="20.0.0.5">Axis A (vector orthogonal on Perp Axes) in second entity coordinate system.</add>
+        <field name="Pivot A" type="Vector4" ver2="20.0.0.5">Pivot point around which the object will rotate.</field>
+        <field name="Perp Axis In A1" type="Vector4" ver2="20.0.0.5">Vector in the rotation plane which defines the zero angle.</field>
+        <field name="Perp Axis In A2" type="Vector4" ver2="20.0.0.5">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation.</field>
+        <field name="Pivot B" type="Vector4" ver2="20.0.0.5">Pivot A in second entity coordinate system.</field>
+        <field name="Axis B" type="Vector4" ver2="20.0.0.5">Axis A (vector orthogonal on Perp Axes) in second entity coordinate system.</field>
 
         <!-- Fallout 3 -->
-        <add name="Axis A" type="Vector4" ver1="20.2.0.7">Axis of rotation.</add>
-        <add name="Perp Axis In A1" type="Vector4" ver1="20.2.0.7">Vector in the rotation plane which defines the zero angle.</add>
-        <add name="Perp Axis In A2" type="Vector4" ver1="20.2.0.7">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</add>
-        <add name="Pivot A" type="Vector4" ver1="20.2.0.7">Pivot point around which the object will rotate.</add>
-        <add name="Axis B" type="Vector4" ver1="20.2.0.7">Axis A in second entity coordinate system.</add>
-        <add name="Perp Axis In B1" type="Vector4" ver1="20.2.0.7">Perp Axis In A1 in second entity coordinate system.</add>
-        <add name="Perp Axis In B2" type="Vector4" ver1="20.2.0.7">Perp Axis In A2 in second entity coordinate system.</add>
-        <add name="Pivot B" type="Vector4" ver1="20.2.0.7">Pivot A in second entity coordinate system.</add>
+        <field name="Axis A" type="Vector4" ver1="20.2.0.7">Axis of rotation.</field>
+        <field name="Perp Axis In A1" type="Vector4" ver1="20.2.0.7">Vector in the rotation plane which defines the zero angle.</field>
+        <field name="Perp Axis In A2" type="Vector4" ver1="20.2.0.7">Vector in the rotation plane, orthogonal on the previous one, which defines the positive direction of rotation. This is always the vector product of Axis A and Perp Axis In A1.</field>
+        <field name="Pivot A" type="Vector4" ver1="20.2.0.7">Pivot point around which the object will rotate.</field>
+        <field name="Axis B" type="Vector4" ver1="20.2.0.7">Axis A in second entity coordinate system.</field>
+        <field name="Perp Axis In B1" type="Vector4" ver1="20.2.0.7">Perp Axis In A1 in second entity coordinate system.</field>
+        <field name="Perp Axis In B2" type="Vector4" ver1="20.2.0.7">Perp Axis In A2 in second entity coordinate system.</field>
+        <field name="Pivot B" type="Vector4" ver1="20.2.0.7">Pivot A in second entity coordinate system.</field>
     </compound>
 
     <compound name="bhkBallAndSocketConstraintCInfo" size="32" versions="#BETHESDA#">
         Serialization data for bhkBallAndSocketConstraint.
         Point-to-point constraint that attempts to keep the pivot point of two bodies in the same space.
-        <add name="Pivot A" type="Vector4">Constraint pivot in Entity A space.</add>
-        <add name="Pivot B" type="Vector4">Constraint pivot in Entity B space.</add>
+        <field name="Pivot A" type="Vector4">Constraint pivot in Entity A space.</field>
+        <field name="Pivot B" type="Vector4">Constraint pivot in Entity B space.</field>
     </compound>
 
     <compound name="bhkPrismaticConstraintCInfo" versions="#BETHESDA#">
@@ -2384,45 +2384,45 @@
         Creates a rail between two bodies that allows translation along a single axis with linear limits and a motor.
         All three rotation axes and the remaining two translation axes are fixed.
         <!-- Oblivion -->
-        <add name="Pivot A" type="Vector4" ver2="20.0.0.5">Pivot.</add>
-        <add name="Rotation A" type="Vector4" ver2="20.0.0.5">Rotation axis.</add>
-        <add name="Plane A" type="Vector4" ver2="20.0.0.5">Plane normal. Describes the plane the object is able to move on.</add>
-        <add name="Sliding A" type="Vector4" ver2="20.0.0.5">Describes the axis the object is able to travel along. Unit vector.</add>
-        <add name="Sliding B" type="Vector4" ver2="20.0.0.5">Describes the axis the object is able to travel along in B coordinates. Unit vector.</add>
-        <add name="Pivot B" type="Vector4" ver2="20.0.0.5">Pivot in B coordinates.</add>
-        <add name="Rotation B" type="Vector4" ver2="20.0.0.5">Rotation axis.</add>
-        <add name="Plane B" type="Vector4" ver2="20.0.0.5">Plane normal. Describes the plane the object is able to move on in B coordinates.</add>
+        <field name="Pivot A" type="Vector4" ver2="20.0.0.5">Pivot.</field>
+        <field name="Rotation A" type="Vector4" ver2="20.0.0.5">Rotation axis.</field>
+        <field name="Plane A" type="Vector4" ver2="20.0.0.5">Plane normal. Describes the plane the object is able to move on.</field>
+        <field name="Sliding A" type="Vector4" ver2="20.0.0.5">Describes the axis the object is able to travel along. Unit vector.</field>
+        <field name="Sliding B" type="Vector4" ver2="20.0.0.5">Describes the axis the object is able to travel along in B coordinates. Unit vector.</field>
+        <field name="Pivot B" type="Vector4" ver2="20.0.0.5">Pivot in B coordinates.</field>
+        <field name="Rotation B" type="Vector4" ver2="20.0.0.5">Rotation axis.</field>
+        <field name="Plane B" type="Vector4" ver2="20.0.0.5">Plane normal. Describes the plane the object is able to move on in B coordinates.</field>
         
         <!-- Fallout 3 and later, Havok 660 and 2010
              In reality Havok loads these as Transform A and Transform B using hkTransform -->
-        <add name="Sliding A" type="Vector4" ver1="20.2.0.7">Describes the axis the object is able to travel along. Unit vector.</add>
-        <add name="Rotation A" type="Vector4" ver1="20.2.0.7">Rotation axis.</add>
-        <add name="Plane A" type="Vector4" ver1="20.2.0.7">Plane normal. Describes the plane the object is able to move on.</add>
-        <add name="Pivot A" type="Vector4" ver1="20.2.0.7">Pivot.</add>
-        <add name="Sliding B" type="Vector4" ver1="20.2.0.7">Describes the axis the object is able to travel along in B coordinates. Unit vector.</add>
-        <add name="Rotation B" type="Vector4" ver1="20.2.0.7">Rotation axis.</add>
-        <add name="Plane B" type="Vector4" ver1="20.2.0.7">Plane normal. Describes the plane the object is able to move on in B coordinates.</add>
-        <add name="Pivot B" type="Vector4" ver1="20.2.0.7">Pivot in B coordinates.</add>
+        <field name="Sliding A" type="Vector4" ver1="20.2.0.7">Describes the axis the object is able to travel along. Unit vector.</field>
+        <field name="Rotation A" type="Vector4" ver1="20.2.0.7">Rotation axis.</field>
+        <field name="Plane A" type="Vector4" ver1="20.2.0.7">Plane normal. Describes the plane the object is able to move on.</field>
+        <field name="Pivot A" type="Vector4" ver1="20.2.0.7">Pivot.</field>
+        <field name="Sliding B" type="Vector4" ver1="20.2.0.7">Describes the axis the object is able to travel along in B coordinates. Unit vector.</field>
+        <field name="Rotation B" type="Vector4" ver1="20.2.0.7">Rotation axis.</field>
+        <field name="Plane B" type="Vector4" ver1="20.2.0.7">Plane normal. Describes the plane the object is able to move on in B coordinates.</field>
+        <field name="Pivot B" type="Vector4" ver1="20.2.0.7">Pivot in B coordinates.</field>
 
-        <add name="Min Distance" type="float">Describe the min distance the object is able to travel.</add>
-        <add name="Max Distance" type="float">Describe the max distance the object is able to travel.</add>
-        <add name="Friction" type="float">Friction.</add>
+        <field name="Min Distance" type="float">Describe the min distance the object is able to travel.</field>
+        <field name="Max Distance" type="float">Describe the max distance the object is able to travel.</field>
+        <field name="Friction" type="float">Friction.</field>
 
-        <add name="Motor" type="bhkConstraintMotorCInfo" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
+        <field name="Motor" type="bhkConstraintMotorCInfo" ver1="20.2.0.7" vercond="!#NI_BS_LTE_16#" />
     </compound>
 
     <compound name="bhkStiffSpringConstraintCInfo" size="36" versions="#BETHESDA#">
         bhkStiffSpringConstraint serialization data. Holds two bodies at a specified distance from one another.
-        <add name="Pivot A" type="Vector4" />
-        <add name="Pivot B" type="Vector4" />
-        <add name="Length" type="float" />
+        <field name="Pivot A" type="Vector4" />
+        <field name="Pivot B" type="Vector4" />
+        <field name="Length" type="float" />
     </compound>
 
     <compound name="OldSkinData" size="18">
         Used to store skin weights in NiTriShapeSkinController.
-        <add name="Vertex Weight" type="float">The amount that this bone affects the vertex.</add>
-        <add name="Vertex Index" type="ushort">The index of the vertex that this weight applies to.</add>
-        <add name="Unknown Vector" type="Vector3" />
+        <field name="Vertex Weight" type="float">The amount that this bone affects the vertex.</field>
+        <field name="Vertex Index" type="ushort">The index of the vertex that this weight applies to.</field>
+        <field name="Unknown Vector" type="Vector3" />
     </compound>
 
     <enum name="ImageType" storage="uint">
@@ -2433,61 +2433,61 @@
 
     <compound name="BoxBV" size="60">
         Box Bounding Volume
-        <add name="Center" type="Vector3" />
-        <add name="Axis" type="Vector3" arr1="3" />
-        <add name="Extent" type="Vector3" />
+        <field name="Center" type="Vector3" />
+        <field name="Axis" type="Vector3" arr1="3" />
+        <field name="Extent" type="Vector3" />
     </compound>
 
     <compound name="CapsuleBV" size="32">
         Capsule Bounding Volume
-        <add name="Center" type="Vector3" />
-        <add name="Origin" type="Vector3" />
-        <add name="Extent" type="float" />
-        <add name="Radius" type="float" />
+        <field name="Center" type="Vector3" />
+        <field name="Origin" type="Vector3" />
+        <field name="Extent" type="float" />
+        <field name="Radius" type="float" />
     </compound>
 
     <compound name="HalfSpaceBV" size="28">
-        <add name="Plane" type="NiPlane" />
-        <add name="Center" type="Vector3" />
+        <field name="Plane" type="NiPlane" />
+        <field name="Center" type="Vector3" />
     </compound>
 
     <compound name="BoundingVolume">
-        <add name="Collision Type" type="BoundVolumeType">Type of collision data.</add>
-        <add name="Sphere" type="NiBound" cond="Collision Type == 0" />
-        <add name="Box" type="BoxBV" cond="Collision Type == 1" />
-        <add name="Capsule" type="CapsuleBV" cond="Collision Type == 2" />
-        <!--<add name="Union BV" type="UnionBV" cond="Collision Type == 4" />-->
-        <add name="Half Space" type="HalfSpaceBV" cond="Collision Type == 5" />
+        <field name="Collision Type" type="BoundVolumeType">Type of collision data.</field>
+        <field name="Sphere" type="NiBound" cond="Collision Type == 0" />
+        <field name="Box" type="BoxBV" cond="Collision Type == 1" />
+        <field name="Capsule" type="CapsuleBV" cond="Collision Type == 2" />
+        <!--<field name="Union BV" type="UnionBV" cond="Collision Type == 4" />-->
+        <field name="Half Space" type="HalfSpaceBV" cond="Collision Type == 5" />
     </compound>
 
     <compound name="UnionBV">
-        <add name="Num BV" type="uint" />
-        <add name="Bounding Volumes" type="BoundingVolume" arr1="Num BV" />
+        <field name="Num BV" type="uint" />
+        <field name="Bounding Volumes" type="BoundingVolume" arr1="Num BV" />
     </compound>
 
     <compound name="MorphWeight" size="8">
-        <add name="Interpolator" type="Ref" template="NiInterpolator" />
-        <add name="Weight" type="float" />
+        <field name="Interpolator" type="Ref" template="NiInterpolator" />
+        <field name="Weight" type="float" />
     </compound>
 
     <compound name="BoneTransform" size="40">
         Transformation data for the bone at this index in bhkPoseArray.
-        <add name="Translation" type="Vector3" />
-        <add name="Rotation" type="hkQuaternion" />
-        <add name="Scale" type="Vector3" />
+        <field name="Translation" type="Vector3" />
+        <field name="Rotation" type="hkQuaternion" />
+        <field name="Scale" type="Vector3" />
     </compound>
 
     <compound name="BonePose" versions="#FO3_AND_LATER#">
         A list of transforms for each bone in bhkPoseArray.
-        <add name="Num Transforms" type="uint" />
-        <add name="Transforms" type="BoneTransform" arr1="Num Transforms" />
+        <field name="Num Transforms" type="uint" />
+        <field name="Transforms" type="BoneTransform" arr1="Num Transforms" />
     </compound>
 
     <compound name="DecalVectorArray" versions="#FO3_AND_LATER#">
         Array of Vectors for Decal placement in BSDecalPlacementVectorExtraData.
-        <add name="Num Vectors" type="ushort" />
-        <add name="Points" type="Vector3" arr1="Num Vectors">Vector XYZ coords</add>
-        <add name="Normals" type="Vector3" arr1="Num Vectors">Vector Normals</add>
+        <field name="Num Vectors" type="ushort" />
+        <field name="Points" type="Vector3" arr1="Num Vectors">Vector XYZ coords</field>
+        <field name="Normals" type="Vector3" arr1="Num Vectors">Vector Normals</field>
     </compound>
 
     <bitflags name="BSPartFlag" storage="ushort" versions="#BETHESDA#">
@@ -2498,77 +2498,77 @@
 
     <compound name="BodyPartList" size="4" versions="#BETHESDA#">
         Body part list for DismemberSkinInstance
-        <add name="Part Flag" type="BSPartFlag" default="257">Flags related to the Body Partition</add>
-        <add name="Body Part" type="BSDismemberBodyPartType">Body Part Index</add>
+        <field name="Part Flag" type="BSPartFlag" default="257">Flags related to the Body Partition</field>
+        <field name="Body Part" type="BSDismemberBodyPartType">Body Part Index</field>
     </compound>
     
     <compound name="BoneLOD" size="8" versions="#SKY_AND_LATER#">
         Stores Bone Level of Detail info in a BSBoneLODExtraData
-        <add name="Distance" type="uint" />
-        <add name="Bone Name" type="NiFixedString" />
+        <field name="Distance" type="uint" />
+        <field name="Bone Name" type="NiFixedString" />
     </compound>
 
     <compound name="bhkMeshMaterial" size="8" versions="#SKY_AND_LATER#">
         hkpBSMaterial, a subclass of hkpMeshMaterial. hkpMeshMaterial is a base class for material info for hkMeshShapes.
-        <add name="Material" type="SkyrimHavokMaterial" />
-        <add name="Filter" type="HavokFilter" />
+        <field name="Material" type="SkyrimHavokMaterial" />
+        <field name="Filter" type="HavokFilter" />
     </compound>
 
     <compound name="bhkCMSBigTri" size="12" versions="#SKY_AND_LATER#">
         Bethesda extension of hkpCompressedMeshShape::BigTriangle. Triangles that don't fit the maximum size.
-        <add name="Triangle" type="Triangle" />
-        <add name="Material" type="uint" />
-        <add name="Welding Info" type="ushort" />
+        <field name="Triangle" type="Triangle" />
+        <field name="Material" type="uint" />
+        <field name="Welding Info" type="ushort" />
     </compound>
     
     <compound name="bhkQsTransform" size="32" versions="#SKY_AND_LATER#">
         Bethesda extension of hkQsTransform. The scale vector is not serialized.
-        <add name="Translation" type="Vector4">A vector that moves the chunk by the specified amount. W is not used.</add>
-        <add name="Rotation" type="hkQuaternion">Rotation. Reference point for rotation is bhkRigidBody translation.</add>
+        <field name="Translation" type="Vector4">A vector that moves the chunk by the specified amount. W is not used.</field>
+        <field name="Rotation" type="hkQuaternion">Rotation. Reference point for rotation is bhkRigidBody translation.</field>
     </compound>
     
     <compound name="bhkCMSChunk" versions="#SKY_AND_LATER#">
         Bethesda extension of hkpCompressedMeshShape::Chunk. A compressed chunk of hkpCompressedMeshShape geometry.
-        <add name="Translation" type="Vector4" />
-        <add name="Material Index" type="uint">Index of material in bhkCompressedMeshShapeData::Chunk Materials</add>
-        <add name="Reference" type="ushort" default="#USHRT_MAX#">Index of another chunk in the chunks list.</add>
-        <add name="Transform Index" type="ushort">Index of transformation in bhkCompressedMeshShapeData::Chunk Transforms</add>
-        <add name="Num Vertices" type="uint" />
-        <add name="Vertices" type="ushort" arr1="Num Vertices" />
-        <add name="Num Indices" type="uint" />
-        <add name="Indices" type="ushort" arr1="Num Indices" />
-        <add name="Num Strips" type="uint" />
-        <add name="Strips" type="ushort" arr1="Num Strips" />
-        <add name="Num Welding Info" type="uint" />
-        <add name="Welding Info" type="ushort" arr1="Num Welding Info" />
+        <field name="Translation" type="Vector4" />
+        <field name="Material Index" type="uint">Index of material in bhkCompressedMeshShapeData::Chunk Materials</field>
+        <field name="Reference" type="ushort" default="#USHRT_MAX#">Index of another chunk in the chunks list.</field>
+        <field name="Transform Index" type="ushort">Index of transformation in bhkCompressedMeshShapeData::Chunk Transforms</field>
+        <field name="Num Vertices" type="uint" />
+        <field name="Vertices" type="ushort" arr1="Num Vertices" />
+        <field name="Num Indices" type="uint" />
+        <field name="Indices" type="ushort" arr1="Num Indices" />
+        <field name="Num Strips" type="uint" />
+        <field name="Strips" type="ushort" arr1="Num Strips" />
+        <field name="Num Welding Info" type="uint" />
+        <field name="Welding Info" type="ushort" arr1="Num Welding Info" />
     </compound>
 
     <compound name="bhkMalleableConstraintCInfo" versions="#BETHESDA#">
         bhkMalleableConstraint serialization data. A constraint wrapper used to soften or harden constraints.
-        <add name="Type" type="hkConstraintType">Type of constraint.</add>
-        <add name="Constraint Info" type="bhkConstraintCInfo" />
-        <add name="Ball and Socket" type="bhkBallAndSocketConstraintCInfo" cond="Type == 0" />
-        <add name="Hinge" type="bhkHingeConstraintCInfo" cond="Type == 1" />
-        <add name="Limited Hinge" type="bhkLimitedHingeConstraintCInfo" cond="Type == 2" />
-        <add name="Prismatic" type="bhkPrismaticConstraintCInfo" cond="Type == 6" />
-        <add name="Ragdoll" type="bhkRagdollConstraintCInfo" cond="Type == 7" />
-        <add name="Stiff Spring" type="bhkStiffSpringConstraintCInfo" cond="Type == 8" />
-        <add name="Tau" type="float" ver2="20.0.0.5" />
-        <add name="Damping" type="float" ver2="20.0.0.5" />
-        <add name="Strength" type="float" ver1="20.2.0.7" />
+        <field name="Type" type="hkConstraintType">Type of constraint.</field>
+        <field name="Constraint Info" type="bhkConstraintCInfo" />
+        <field name="Ball and Socket" type="bhkBallAndSocketConstraintCInfo" cond="Type == 0" />
+        <field name="Hinge" type="bhkHingeConstraintCInfo" cond="Type == 1" />
+        <field name="Limited Hinge" type="bhkLimitedHingeConstraintCInfo" cond="Type == 2" />
+        <field name="Prismatic" type="bhkPrismaticConstraintCInfo" cond="Type == 6" />
+        <field name="Ragdoll" type="bhkRagdollConstraintCInfo" cond="Type == 7" />
+        <field name="Stiff Spring" type="bhkStiffSpringConstraintCInfo" cond="Type == 8" />
+        <field name="Tau" type="float" ver2="20.0.0.5" />
+        <field name="Damping" type="float" ver2="20.0.0.5" />
+        <field name="Strength" type="float" ver1="20.2.0.7" />
     </compound>
 
     <compound name="bhkWrappedConstraintData" versions="#BETHESDA#">
         A constraint wrapper for polymorphic hkpConstraintData serialization.
-        <add name="Type" type="hkConstraintType">Type of constraint.</add>
-        <add name="Constraint Info" type="bhkConstraintCInfo" />
-        <add name="Ball and Socket" type="bhkBallAndSocketConstraintCInfo" cond="Type == 0" />
-        <add name="Hinge" type="bhkHingeConstraintCInfo" cond="Type == 1" />
-        <add name="Limited Hinge" type="bhkLimitedHingeConstraintCInfo" cond="Type == 2" />
-        <add name="Prismatic" type="bhkPrismaticConstraintCInfo" cond="Type == 6" />
-        <add name="Ragdoll" type="bhkRagdollConstraintCInfo" cond="Type == 7" />
-        <add name="Stiff Spring" type="bhkStiffSpringConstraintCInfo" cond="Type == 8" />
-        <add name="Malleable" type="bhkMalleableConstraintCInfo" cond="Type == 13" />
+        <field name="Type" type="hkConstraintType">Type of constraint.</field>
+        <field name="Constraint Info" type="bhkConstraintCInfo" />
+        <field name="Ball and Socket" type="bhkBallAndSocketConstraintCInfo" cond="Type == 0" />
+        <field name="Hinge" type="bhkHingeConstraintCInfo" cond="Type == 1" />
+        <field name="Limited Hinge" type="bhkLimitedHingeConstraintCInfo" cond="Type == 2" />
+        <field name="Prismatic" type="bhkPrismaticConstraintCInfo" cond="Type == 6" />
+        <field name="Ragdoll" type="bhkRagdollConstraintCInfo" cond="Type == 7" />
+        <field name="Stiff Spring" type="bhkStiffSpringConstraintCInfo" cond="Type == 8" />
+        <field name="Malleable" type="bhkMalleableConstraintCInfo" cond="Type == 13" />
     </compound>
 
     <!-- NIF Objects
@@ -2584,61 +2584,61 @@
 
     <niobject name="Ni3dsAlphaAnimator" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown.
-        <add name="Unknown 1" type="byte" arr1="40" />
-        <add name="Parent" type="Ref" template="NiObject" />
-        <add name="Num 1" type="uint" />
-        <add name="Num 2" type="uint" />
-        <add name="Unknown 2" type="uint" arr1="Num 1 * Num 2" arr2="2" />
+        <field name="Unknown 1" type="byte" arr1="40" />
+        <field name="Parent" type="Ref" template="NiObject" />
+        <field name="Num 1" type="uint" />
+        <field name="Num 2" type="uint" />
+        <field name="Unknown 2" type="uint" arr1="Num 1 * Num 2" arr2="2" />
     </niobject>
 
     <niobject name="Ni3dsAnimationNode" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown. Only found in 2.3 nifs.
-        <add name="Name" type="SizedString">Name of this object.</add>
-        <add name="Has Data" type="bool" />
-        <add name="Unknown Floats 1" type="float" arr1="21" cond="Has Data" />
-        <add name="Unknown Short" type="ushort" cond="Has Data" />
-        <add name="Child" type="Ref" template="NiObject" cond="Has Data" />
-        <add name="Unknown Floats 2" type="float" arr1="12" cond="Has Data" />
-        <add name="Count" type="uint" cond="Has Data">A count.</add>
-        <add name="Unknown Array" type="byte" arr1="Count" arr2="5" cond="Has Data" />
+        <field name="Name" type="SizedString">Name of this object.</field>
+        <field name="Has Data" type="bool" />
+        <field name="Unknown Floats 1" type="float" arr1="21" cond="Has Data" />
+        <field name="Unknown Short" type="ushort" cond="Has Data" />
+        <field name="Child" type="Ref" template="NiObject" cond="Has Data" />
+        <field name="Unknown Floats 2" type="float" arr1="12" cond="Has Data" />
+        <field name="Count" type="uint" cond="Has Data">A count.</field>
+        <field name="Unknown Array" type="byte" arr1="Count" arr2="5" cond="Has Data" />
     </niobject>
 
     <niobject name="Ni3dsColorAnimator" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown!
-        <add name="Unknown 1" type="byte" arr1="184" />
+        <field name="Unknown 1" type="byte" arr1="184" />
     </niobject>
 
     <niobject name="Ni3dsMorphShape" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown!
-        <add name="Unknown 1" type="byte" arr1="14" />
+        <field name="Unknown 1" type="byte" arr1="14" />
     </niobject>
 
     <niobject name="Ni3dsParticleSystem" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown!
-        <add name="Unknown 1" type="byte" arr1="14" />
+        <field name="Unknown 1" type="byte" arr1="14" />
     </niobject>
 
     <niobject name="Ni3dsPathController" inherit="NiObject" module="NiLegacy" versions="V2_3">
         Unknown!
-        <add name="Unknown 1" type="byte" arr1="20" />
+        <field name="Unknown 1" type="byte" arr1="20" />
     </niobject>
 
 
     <niobject name="NiParticleModifier" abstract="true" inherit="NiObject" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1). Abstract base class for particle system modifiers.
-        <add name="Next Modifier" type="Ref" template="NiParticleModifier">Next particle modifier.</add>
-        <add name="Controller" type="Ptr" template="NiParticleSystemController" ver1="3.3.0.13">Points to the particle system controller parent.</add>
+        <field name="Next Modifier" type="Ref" template="NiParticleModifier">Next particle modifier.</field>
+        <field name="Controller" type="Ptr" template="NiParticleSystemController" ver1="3.3.0.13">Points to the particle system controller parent.</field>
     </niobject>
 
     <niobject name="NiPSysCollider" abstract="true" inherit="NiObject" module="NiParticle">
         Particle system collider.
-        <add name="Bounce" type="float" default="1.0">Amount of bounce for the collider.</add>
-        <add name="Spawn on Collide" type="bool">Spawn particles on impact?</add>
-        <add name="Die on Collide" type="bool">Kill particles on impact?</add>
-        <add name="Spawn Modifier" type="Ref" template="NiPSysSpawnModifier">Spawner to use for the collider.</add>
-        <add name="Parent" type="Ptr" template="NiPSysColliderManager">Link to parent.</add>
-        <add name="Next Collider" type="Ref" template="NiPSysCollider">The next collider.</add>
-        <add name="Collider Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the collider.</add>
+        <field name="Bounce" type="float" default="1.0">Amount of bounce for the collider.</field>
+        <field name="Spawn on Collide" type="bool">Spawn particles on impact?</field>
+        <field name="Die on Collide" type="bool">Kill particles on impact?</field>
+        <field name="Spawn Modifier" type="Ref" template="NiPSysSpawnModifier">Spawner to use for the collider.</field>
+        <field name="Parent" type="Ptr" template="NiPSysColliderManager">Link to parent.</field>
+        <field name="Next Collider" type="Ref" template="NiPSysCollider">The next collider.</field>
+        <field name="Collider Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the collider.</field>
     </niobject>
 
     <enum name="BroadPhaseType" storage="byte" versions="#BETHESDA#">
@@ -2658,24 +2658,24 @@
 
     <compound name="bhkWorldObjCInfoProperty" size="12" versions="#BETHESDA#">
         hkWorldObjectCinfo::Property struct
-        <add name="Data" type="uint" default="0" />
-        <add name="Size" type="uint" default="0" />
-        <add name="Capacity and Flags" type="uint" default="0x80000000" />
+        <field name="Data" type="uint" default="0" />
+        <field name="Size" type="uint" default="0" />
+        <field name="Capacity and Flags" type="uint" default="0x80000000" />
     </compound>
 
     <compound name="bhkWorldObjectCInfo">
-        <add name="Unused 01" type="byte" arr1="4" binary="true" />
-        <add name="Broad Phase Type" type="BroadPhaseType" default="BROAD_PHASE_ENTITY" />
-        <add name="Unused 02" type="byte" arr1="3" binary="true" />
-        <add name="Property" type="bhkWorldObjCInfoProperty" />
+        <field name="Unused 01" type="byte" arr1="4" binary="true" />
+        <field name="Broad Phase Type" type="BroadPhaseType" default="BROAD_PHASE_ENTITY" />
+        <field name="Unused 02" type="byte" arr1="3" binary="true" />
+        <field name="Property" type="bhkWorldObjCInfoProperty" />
     </compound>
 
     <niobject name="bhkWorldObject" abstract="true" inherit="bhkSerializable" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpWorldObject, the base class for hkpEntity and hkpPhantom.
-        <add name="Shape" type="Ref" template="bhkShape">The shape for this collision object.</add>
-        <add name="Unknown Int" type="uint" ver2="10.0.1.2" />
-        <add name="Havok Filter" type="HavokFilter" />
-        <add name="World Object Info" type="bhkWorldObjectCInfo" />
+        <field name="Shape" type="Ref" template="bhkShape">The shape for this collision object.</field>
+        <field name="Unknown Int" type="uint" ver2="10.0.1.2" />
+        <field name="Havok Filter" type="HavokFilter" />
+        <field name="World Object Info" type="bhkWorldObjectCInfo" />
     </niobject>
 
     <niobject name="bhkPhantom" abstract="true" inherit="bhkWorldObject" module="BSHavok" versions="#BETHESDA#">
@@ -2687,8 +2687,8 @@
         Bethesda extension of hkpAabbPhantom. A non-physical object made up of only an AABB.
             - Very fast as they use only broadphase collision detection.
             - Used for triggers/regions where a shape is not necessary.
-        <add name="Unused 01" type="byte" arr1="8" binary="true" />
-        <add name="AABB" type="hkAabb" />
+        <field name="Unused 01" type="byte" arr1="8" binary="true" />
+        <field name="AABB" type="hkAabb" />
     </niobject>
 
     <niobject name="bhkShapePhantom" abstract="true" inherit="bhkPhantom" module="BSHavok" versions="#BETHESDA#">
@@ -2698,155 +2698,155 @@
     <niobject name="bhkSimpleShapePhantom" inherit="bhkShapePhantom" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpSimpleShapePhantom. A Phantom with arbitrary shape and transform.
         Does not do any narrowphase caching, in contrast to hkpCachingShapePhantom.
-        <add name="Unused 01" type="byte" arr1="8" binary="true" />
-        <add name="Transform" type="Matrix44" />
+        <field name="Unused 01" type="byte" arr1="8" binary="true" />
+        <field name="Transform" type="Matrix44" />
     </niobject>
 
     <compound name="bhkEntityCInfo">
-        <add name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT">How the body reacts to collisions. See hkResponseType for hkpWorld default implementations.</add>
-        <add name="Unused 01" type="byte" />
-        <add name="Process Contact Callback Delay" type="ushort" default="0xffff">Lowers the frequency for processContactCallbacks. A value of 5 means that a callback is raised every 5th frame. The default is once every 65535 frames.</add>
+        <field name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT">How the body reacts to collisions. See hkResponseType for hkpWorld default implementations.</field>
+        <field name="Unused 01" type="byte" />
+        <field name="Process Contact Callback Delay" type="ushort" default="0xffff">Lowers the frequency for processContactCallbacks. A value of 5 means that a callback is raised every 5th frame. The default is once every 65535 frames.</field>
     </compound>
 
     <niobject name="bhkEntity" abstract="true" inherit="bhkWorldObject" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpEntity. An Entity is the core physical object in the system.
-        <add name="Entity Info" type="bhkEntityCInfo" />
+        <field name="Entity Info" type="bhkEntityCInfo" />
     </niobject>
 
     <compound name="bhkRigidBodyCInfo550_660">
-        <add name="Unused 01" type="byte" arr1="4" binary="true" ver1="10.1.0.0" />
-        <add name="Havok Filter" type="HavokFilter" ver1="10.1.0.0" />
-        <add name="Unused 02" type="byte" arr1="4" binary="true" ver1="10.1.0.0" />
-        <add name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT" ver1="10.1.0.0" />
-        <add name="Unused 03" type="byte" ver1="10.1.0.0" />
-        <add name="Process Contact Callback Delay" type="ushort" default="0xffff" ver1="10.1.0.0" />
-        <add name="Unused 04" type="byte" arr1="4" binary="true" />
-        <add name="Translation" type="Vector4"> A vector that moves the body by the specified amount. Only enabled in bhkRigidBodyT objects.</add>
-        <add name="Rotation" type="hkQuaternion">The rotation Yaw/Pitch/Roll to apply to the body. Only enabled in bhkRigidBodyT objects.</add>
-        <add name="Linear Velocity" type="Vector4">Linear velocity.</add>
-        <add name="Angular Velocity" type="Vector4">Angular velocity.</add>
-        <add name="Inertia Tensor" type="hkMatrix3">Defines how the mass is distributed among the body, i.e. how difficult it is to rotate around any given axis.</add>
-        <add name="Center" type="Vector4">The body's center of mass.</add>
-        <add name="Mass" type="float" default="1.0">The body's mass in kg. A mass of zero represents an immovable object.</add>
-        <add name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</add>
-        <add name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</add>
-        <add name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</add>
-        <add name="Restitution" type="float" default="0.4">
+        <field name="Unused 01" type="byte" arr1="4" binary="true" ver1="10.1.0.0" />
+        <field name="Havok Filter" type="HavokFilter" ver1="10.1.0.0" />
+        <field name="Unused 02" type="byte" arr1="4" binary="true" ver1="10.1.0.0" />
+        <field name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT" ver1="10.1.0.0" />
+        <field name="Unused 03" type="byte" ver1="10.1.0.0" />
+        <field name="Process Contact Callback Delay" type="ushort" default="0xffff" ver1="10.1.0.0" />
+        <field name="Unused 04" type="byte" arr1="4" binary="true" />
+        <field name="Translation" type="Vector4"> A vector that moves the body by the specified amount. Only enabled in bhkRigidBodyT objects.</field>
+        <field name="Rotation" type="hkQuaternion">The rotation Yaw/Pitch/Roll to apply to the body. Only enabled in bhkRigidBodyT objects.</field>
+        <field name="Linear Velocity" type="Vector4">Linear velocity.</field>
+        <field name="Angular Velocity" type="Vector4">Angular velocity.</field>
+        <field name="Inertia Tensor" type="hkMatrix3">Defines how the mass is distributed among the body, i.e. how difficult it is to rotate around any given axis.</field>
+        <field name="Center" type="Vector4">The body's center of mass.</field>
+        <field name="Mass" type="float" default="1.0">The body's mass in kg. A mass of zero represents an immovable object.</field>
+        <field name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</field>
+        <field name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</field>
+        <field name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</field>
+        <field name="Restitution" type="float" default="0.4">
             How "bouncy" the body is, i.e. how much energy it has after colliding. Less than 1.0 loses energy, greater than 1.0 gains energy.
             If the restitution is not 0.0 the object will need extra CPU for all new collisions.
-        </add>
-        <add name="Max Linear Velocity" type="float" default="104.4" ver1="10.1.0.0">Maximal linear velocity.</add>
-        <add name="Max Angular Velocity" type="float" default="31.57" ver1="10.1.0.0">Maximal angular velocity.</add>
-        <add name="Penetration Depth" type="float" default="0.15" ver1="10.1.0.0">
+        </field>
+        <field name="Max Linear Velocity" type="float" default="104.4" ver1="10.1.0.0">Maximal linear velocity.</field>
+        <field name="Max Angular Velocity" type="float" default="31.57" ver1="10.1.0.0">Maximal angular velocity.</field>
+        <field name="Penetration Depth" type="float" default="0.15" ver1="10.1.0.0">
             The maximum allowed penetration for this object.
             This is a hint to the engine to see how much CPU the engine should invest to keep this object from penetrating.
             A good choice is 5% - 20% of the smallest diameter of the object.
-        </add>
-        <add name="Motion System" type="hkMotionType" default="MO_SYS_DYNAMIC">Motion system? Overrides Quality when on Keyframed?</add>
-        <add name="Deactivator Type" type="hkDeactivatorType" default="DEACTIVATOR_NEVER">The initial deactivator type of the body.</add>
-        <add name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</add>
-        <add name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED">The type of interaction with other objects.</add>
-        <add name="Unused 05" type="byte" arr1="12" binary="true" />
+        </field>
+        <field name="Motion System" type="hkMotionType" default="MO_SYS_DYNAMIC">Motion system? Overrides Quality when on Keyframed?</field>
+        <field name="Deactivator Type" type="hkDeactivatorType" default="DEACTIVATOR_NEVER">The initial deactivator type of the body.</field>
+        <field name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</field>
+        <field name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED">The type of interaction with other objects.</field>
+        <field name="Unused 05" type="byte" arr1="12" binary="true" />
     </compound>
 
     <compound name="bhkRigidBodyCInfo2010">
-        <add name="Unused 01" type="byte" arr1="4" binary="true" />
-        <add name="Havok Filter" type="HavokFilter" />
-        <add name="Unused 02" type="byte" arr1="4" binary="true" />
-        <add name="Unknown Int 1" type="uint" />
-        <add name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT" />
-        <add name="Unused 03" type="byte" />
-        <add name="Process Contact Callback Delay" type="ushort" default="0xffff" />
-        <add name="Translation" type="Vector4"> A vector that moves the body by the specified amount. Only enabled in bhkRigidBodyT objects.</add>
-        <add name="Rotation" type="hkQuaternion">The rotation Yaw/Pitch/Roll to apply to the body. Only enabled in bhkRigidBodyT objects.</add>
-        <add name="Linear Velocity" type="Vector4">Linear velocity.</add>
-        <add name="Angular Velocity" type="Vector4">Angular velocity.</add>
-        <add name="Inertia Tensor" type="hkMatrix3">Defines how the mass is distributed among the body, i.e. how difficult it is to rotate around any given axis.</add>
-        <add name="Center" type="Vector4">The body's center of mass.</add>
-        <add name="Mass" type="float" default="1.0">The body's mass in kg. A mass of zero represents an immovable object.</add>
-        <add name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</add>
-        <add name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</add>
-        <add name="Time Factor" type="float" default="1.0" />
-        <add name="Gravity Factor" type="float" default="1.0" />
-        <add name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</add>
-        <add name="Rolling Friction Multiplier" type="float" />
-        <add name="Restitution" type="float" default="0.4">
+        <field name="Unused 01" type="byte" arr1="4" binary="true" />
+        <field name="Havok Filter" type="HavokFilter" />
+        <field name="Unused 02" type="byte" arr1="4" binary="true" />
+        <field name="Unknown Int 1" type="uint" />
+        <field name="Collision Response" type="hkResponseType" default="RESPONSE_SIMPLE_CONTACT" />
+        <field name="Unused 03" type="byte" />
+        <field name="Process Contact Callback Delay" type="ushort" default="0xffff" />
+        <field name="Translation" type="Vector4"> A vector that moves the body by the specified amount. Only enabled in bhkRigidBodyT objects.</field>
+        <field name="Rotation" type="hkQuaternion">The rotation Yaw/Pitch/Roll to apply to the body. Only enabled in bhkRigidBodyT objects.</field>
+        <field name="Linear Velocity" type="Vector4">Linear velocity.</field>
+        <field name="Angular Velocity" type="Vector4">Angular velocity.</field>
+        <field name="Inertia Tensor" type="hkMatrix3">Defines how the mass is distributed among the body, i.e. how difficult it is to rotate around any given axis.</field>
+        <field name="Center" type="Vector4">The body's center of mass.</field>
+        <field name="Mass" type="float" default="1.0">The body's mass in kg. A mass of zero represents an immovable object.</field>
+        <field name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</field>
+        <field name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</field>
+        <field name="Time Factor" type="float" default="1.0" />
+        <field name="Gravity Factor" type="float" default="1.0" />
+        <field name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</field>
+        <field name="Rolling Friction Multiplier" type="float" />
+        <field name="Restitution" type="float" default="0.4">
             How "bouncy" the body is, i.e. how much energy it has after colliding. Less than 1.0 loses energy, greater than 1.0 gains energy.
             If the restitution is not 0.0 the object will need extra CPU for all new collisions.
-        </add>
-        <add name="Max Linear Velocity" type="float" default="104.4">Maximal linear velocity.</add>
-        <add name="Max Angular Velocity" type="float" default="31.57">Maximal angular velocity.</add>
-        <add name="Penetration Depth" type="float" default="0.15">
+        </field>
+        <field name="Max Linear Velocity" type="float" default="104.4">Maximal linear velocity.</field>
+        <field name="Max Angular Velocity" type="float" default="31.57">Maximal angular velocity.</field>
+        <field name="Penetration Depth" type="float" default="0.15">
             The maximum allowed penetration for this object.
             This is a hint to the engine to see how much CPU the engine should invest to keep this object from penetrating.
             A good choice is 5% - 20% of the smallest diameter of the object.
-        </add>
-        <add name="Motion System" type="hkMotionType" default="MO_SYS_DYNAMIC">Motion system? Overrides Quality when on Keyframed?</add>
-        <add name="Enable Deactivation" type="bool" default="1" />
-        <add name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</add>
-        <add name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED">The type of interaction with other objects.</add>
-        <add name="Auto Remove Level" type="byte" />
-        <add name="Response Modifier Flags" type="byte" />
-        <add name="Num Shape Keys in Contact Point" type="byte" default="3" />
-        <add name="Force Collided Onto PPU" type="bool" />
-        <add name="Unused 04" type="byte" arr1="12" binary="true" />
+        </field>
+        <field name="Motion System" type="hkMotionType" default="MO_SYS_DYNAMIC">Motion system? Overrides Quality when on Keyframed?</field>
+        <field name="Enable Deactivation" type="bool" default="1" />
+        <field name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</field>
+        <field name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED">The type of interaction with other objects.</field>
+        <field name="Auto Remove Level" type="byte" />
+        <field name="Response Modifier Flags" type="byte" />
+        <field name="Num Shape Keys in Contact Point" type="byte" default="3" />
+        <field name="Force Collided Onto PPU" type="bool" />
+        <field name="Unused 04" type="byte" arr1="12" binary="true" />
     </compound>
 
     <compound name="bhkRigidBodyCInfo2014">
-        <add name="Unused 01" type="byte" arr1="4" binary="true" />
-        <add name="Havok Filter" type="HavokFilter" />
-        <add name="Unused 02" type="byte" arr1="12" binary="true" />
-        <add name="Translation" type="Vector4"> A vector that moves the body by the specified amount. Only enabled in bhkRigidBodyT objects.</add>
-        <add name="Rotation" type="hkQuaternion">The rotation Yaw/Pitch/Roll to apply to the body. Only enabled in bhkRigidBodyT objects.</add>
-        <add name="Linear Velocity" type="Vector4">Linear velocity.</add>
-        <add name="Angular Velocity" type="Vector4">Angular velocity.</add>
-        <add name="Inertia Tensor" type="hkMatrix3">Defines how the mass is distributed among the body, i.e. how difficult it is to rotate around any given axis.</add>
-        <add name="Center" type="Vector4">The body's center of mass.</add>
-        <add name="Mass" type="float" default="1.0">The body's mass in kg. A mass of zero represents an immovable object.</add>
-        <add name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</add>
-        <add name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</add>
-        <add name="Gravity Factor" type="float" default="1.0"/>
-        <add name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</add>
-        <add name="Rolling Friction Multiplier" type="float" />
-        <add name="Restitution" type="float" default="0.4">
+        <field name="Unused 01" type="byte" arr1="4" binary="true" />
+        <field name="Havok Filter" type="HavokFilter" />
+        <field name="Unused 02" type="byte" arr1="12" binary="true" />
+        <field name="Translation" type="Vector4"> A vector that moves the body by the specified amount. Only enabled in bhkRigidBodyT objects.</field>
+        <field name="Rotation" type="hkQuaternion">The rotation Yaw/Pitch/Roll to apply to the body. Only enabled in bhkRigidBodyT objects.</field>
+        <field name="Linear Velocity" type="Vector4">Linear velocity.</field>
+        <field name="Angular Velocity" type="Vector4">Angular velocity.</field>
+        <field name="Inertia Tensor" type="hkMatrix3">Defines how the mass is distributed among the body, i.e. how difficult it is to rotate around any given axis.</field>
+        <field name="Center" type="Vector4">The body's center of mass.</field>
+        <field name="Mass" type="float" default="1.0">The body's mass in kg. A mass of zero represents an immovable object.</field>
+        <field name="Linear Damping" type="float" default="0.1">Reduces the movement of the body over time. A value of 0.1 will remove 10% of the linear velocity every second.</field>
+        <field name="Angular Damping" type="float" default="0.05">Reduces the movement of the body over time. A value of 0.05 will remove 5% of the angular velocity every second.</field>
+        <field name="Gravity Factor" type="float" default="1.0"/>
+        <field name="Friction" type="float" default="0.5">How smooth its surfaces is and how easily it will slide along other bodies.</field>
+        <field name="Rolling Friction Multiplier" type="float" />
+        <field name="Restitution" type="float" default="0.4">
             How "bouncy" the body is, i.e. how much energy it has after colliding. Less than 1.0 loses energy, greater than 1.0 gains energy.
             If the restitution is not 0.0 the object will need extra CPU for all new collisions.
-        </add>
-        <add name="Max Linear Velocity" type="float" default="104.4">Maximal linear velocity.</add>
-        <add name="Max Angular Velocity" type="float" default="31.57">Maximal angular velocity.</add>
-        <add name="Motion System" type="hkMotionType" default="MO_SYS_DYNAMIC">Motion system? Overrides Quality when on Keyframed?</add>
-        <add name="Enable Deactivation" type="bool" default="1" />
-        <add name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</add>
-        <add name="Unused 03" type="byte" />
-        <add name="Penetration Depth" type="float" default="0.15">
+        </field>
+        <field name="Max Linear Velocity" type="float" default="104.4">Maximal linear velocity.</field>
+        <field name="Max Angular Velocity" type="float" default="31.57">Maximal angular velocity.</field>
+        <field name="Motion System" type="hkMotionType" default="MO_SYS_DYNAMIC">Motion system? Overrides Quality when on Keyframed?</field>
+        <field name="Enable Deactivation" type="bool" default="1" />
+        <field name="Solver Deactivation" type="hkSolverDeactivation" default="SOLVER_DEACTIVATION_OFF">How aggressively the engine will try to zero the velocity for slow objects. This does not save CPU.</field>
+        <field name="Unused 03" type="byte" />
+        <field name="Penetration Depth" type="float" default="0.15">
             The maximum allowed penetration for this object.
             This is a hint to the engine to see how much CPU the engine should invest to keep this object from penetrating.
             A good choice is 5% - 20% of the smallest diameter of the object.
-        </add>
-        <add name="Time Factor" type="float" />
-        <add name="Unused 04" type="byte" arr1="4" />
-        <add name="Collision Response" type="hkResponseType" />
-        <add name="Unused 05" type="byte" />
-        <add name="Process Contact Callback Delay 3" type="ushort" default="0xffff" />
-        <add name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED" />
-        <add name="Auto Remove Level" type="byte" />
-        <add name="Response Modifier Flags" type="byte" />
-        <add name="Num Shape Keys in Contact Point" type="byte" default="3" />
-        <add name="Force Collided Onto PPU" type="bool" />
-        <add name="Unused 06" type="byte" arr1="3" binary="true" />
+        </field>
+        <field name="Time Factor" type="float" />
+        <field name="Unused 04" type="byte" arr1="4" />
+        <field name="Collision Response" type="hkResponseType" />
+        <field name="Unused 05" type="byte" />
+        <field name="Process Contact Callback Delay 3" type="ushort" default="0xffff" />
+        <field name="Quality Type" type="hkQualityType" default="MO_QUAL_FIXED" />
+        <field name="Auto Remove Level" type="byte" />
+        <field name="Response Modifier Flags" type="byte" />
+        <field name="Num Shape Keys in Contact Point" type="byte" default="3" />
+        <field name="Force Collided Onto PPU" type="bool" />
+        <field name="Unused 06" type="byte" arr1="3" binary="true" />
     </compound>
 
     <niobject name="bhkRigidBody" inherit="bhkEntity" module="BSHavok" versions="#BETHESDA#">
         This is the default body type for all "normal" usable and static world objects. The "T" suffix
         marks this body as active for translation and rotation, a normal bhkRigidBody ignores those
         properties. Because the properties are equal, a bhkRigidBody may be renamed into a bhkRigidBodyT and vice-versa.
-        <add name="Rigid Body Info" suffix="550_660" type="bhkRigidBodyCInfo550_660" vercond="#NI_BS_LTE_FO3#" />
-        <add name="Rigid Body Info" suffix="2010" type="bhkRigidBodyCInfo2010" vercond="#BS_GTE_SKY# #AND# (!#BS_FO4#)" />
-        <add name="Rigid Body Info" suffix="2014" type="bhkRigidBodyCInfo2014" vercond="#BS_FO4#" />
-        <add name="Num Constraints" type="uint" />
-        <add name="Constraints" type="Ref" template="bhkSerializable" arr1="Num Constraints" />
-        <add name="Body Flags" type="uint" vercond="#BSVER# #LT# 76">1 = respond to wind</add>
-        <add name="Body Flags" type="ushort" vercond="#BSVER# #GTE# 76">1 = respond to wind</add>
+        <field name="Rigid Body Info" suffix="550_660" type="bhkRigidBodyCInfo550_660" vercond="#NI_BS_LTE_FO3#" />
+        <field name="Rigid Body Info" suffix="2010" type="bhkRigidBodyCInfo2010" vercond="#BS_GTE_SKY# #AND# (!#BS_FO4#)" />
+        <field name="Rigid Body Info" suffix="2014" type="bhkRigidBodyCInfo2014" vercond="#BS_FO4#" />
+        <field name="Num Constraints" type="uint" />
+        <field name="Constraints" type="Ref" template="bhkSerializable" arr1="Num Constraints" />
+        <field name="Body Flags" type="uint" vercond="#BSVER# #LT# 76">1 = respond to wind</field>
+        <field name="Body Flags" type="ushort" vercond="#BSVER# #GTE# 76">1 = respond to wind</field>
     </niobject>
 
     <niobject name="bhkRigidBodyT" inherit="bhkRigidBody" module="BSHavok" versions="#BETHESDA#">
@@ -2860,73 +2860,73 @@
 
     <niobject name="bhkUnaryAction" abstract="true" inherit="bhkAction" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpUnaryAction. hkpUnaryAction performs an action on one body.
-        <add name="Entity" type="Ptr" template="bhkRigidBody" />
-        <add name="Unused 01" type="byte" arr1="8" binary="true" />
+        <field name="Entity" type="Ptr" template="bhkRigidBody" />
+        <field name="Unused 01" type="byte" arr1="8" binary="true" />
     </niobject>
 
     <niobject name="bhkBinaryAction" abstract="true" inherit="bhkAction" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpBinaryAction. hkpBinaryAction performs an action on two bodies.
-        <add name="Entity A" type="Ptr" template="bhkRigidBody" />
-        <add name="Entity B" type="Ptr" template="bhkRigidBody" />
-        <add name="Unused 01" type="byte" arr1="8" binary="true" />
+        <field name="Entity A" type="Ptr" template="bhkRigidBody" />
+        <field name="Entity B" type="Ptr" template="bhkRigidBody" />
+        <field name="Unused 01" type="byte" arr1="8" binary="true" />
     </niobject>
 
     <niobject name="bhkConstraint" abstract="true" inherit="bhkSerializable" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpConstraintData. Base class for all constraints. 
-        <add name="Constraint Info" type="bhkConstraintCInfo" />
+        <field name="Constraint Info" type="bhkConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkLimitedHingeConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpLimitedHingeConstraintData. Hinge constraint with limits and a motor.
         Enabling the motor will remove any friction.
-        <add name="Constraint" type="bhkLimitedHingeConstraintCInfo" />
+        <field name="Constraint" type="bhkLimitedHingeConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkMalleableConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpMalleableConstraintData. Constraint wrapper used to soften or harden constraints.
         Does not affect angular limits or angular motors.
-        <add name="Constraint" type="bhkMalleableConstraintCInfo" />
+        <field name="Constraint" type="bhkMalleableConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkStiffSpringConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpStiffSpringConstraintData. Holds two bodies at a specified distance from one another.
-        <add name="Constraint" type="bhkStiffSpringConstraintCInfo" />
+        <field name="Constraint" type="bhkStiffSpringConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkRagdollConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpRagdollConstraintData. Creates a joint between two bodies with 3 degrees of freedom and a motor.
         Enabling the motor will remove any friction.
         The area of movement can be represented as a main cone + 2 orthogonal cones which may subtract from the main cone volume depending on limits. 
-        <add name="Constraint" type="bhkRagdollConstraintCInfo" />
+        <field name="Constraint" type="bhkRagdollConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkPrismaticConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpPrismaticConstraintData.
         Creates a rail between two bodies that allows translation along a single axis with linear limits and a motor.
         All three rotation axes and the remaining two translation axes are fixed.
-        <add name="Constraint" type="bhkPrismaticConstraintCInfo" />
+        <field name="Constraint" type="bhkPrismaticConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkHingeConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpHingeConstraintData. A basic hinge with no angular limits or motor.
-        <add name="Constraint" type="bhkHingeConstraintCInfo" />
+        <field name="Constraint" type="bhkHingeConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkBallAndSocketConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpBallAndSocketConstraintData.
         Point-to-point constraint that attempts to keep the pivot point of two bodies in the same space.
-        <add name="Constraint" type="bhkBallAndSocketConstraintCInfo" />
+        <field name="Constraint" type="bhkBallAndSocketConstraintCInfo" />
     </niobject>
 
     <niobject name="bhkBallSocketConstraintChain" inherit="bhkSerializable" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpBallSocketChainData. A chain of ball and socket constraints.
-        <add name="Num Pivots" type="uint" calc="#LEN[Pivots]# * 2">Should equal (Num Chained Entities - 1) * 2</add>
-        <add name="Pivots" type="bhkBallAndSocketConstraintCInfo" arr1="Num Pivots / 2">Two pivot points A and B for each constraint.</add>
-        <add name="Tau" type="float" default="1.0">High values are harder and more reactive, lower values are smoother.</add>
-        <add name="Damping" type="float" default="0.6">Defines damping strength for the current velocity.</add>
-        <add name="Constraint Force Mixing" type="float" default="1.1920929e-08">Restitution (amount of elasticity) of constraints. Added to the diagonal of the constraint matrix. A value of 0.0 can result in a division by zero with some chain configurations.</add>
-        <add name="Max Error Distance" type="float" default="0.1">Maximum distance error in constraints allowed before stabilization algorithm kicks in. A smaller distance causes more resistance.</add>
-        <add name="Constraint Chain Info" type="bhkConstraintChainCInfo" />
+        <field name="Num Pivots" type="uint" calc="#LEN[Pivots]# * 2">Should equal (Num Chained Entities - 1) * 2</field>
+        <field name="Pivots" type="bhkBallAndSocketConstraintCInfo" arr1="Num Pivots / 2">Two pivot points A and B for each constraint.</field>
+        <field name="Tau" type="float" default="1.0">High values are harder and more reactive, lower values are smoother.</field>
+        <field name="Damping" type="float" default="0.6">Defines damping strength for the current velocity.</field>
+        <field name="Constraint Force Mixing" type="float" default="1.1920929e-08">Restitution (amount of elasticity) of constraints. Added to the diagonal of the constraint matrix. A value of 0.0 can result in a division by zero with some chain configurations.</field>
+        <field name="Max Error Distance" type="float" default="0.1">Maximum distance error in constraints allowed before stabilization algorithm kicks in. A smaller distance causes more resistance.</field>
+        <field name="Constraint Chain Info" type="bhkConstraintChainCInfo" />
     </niobject>
 
     <niobject name="bhkShape" abstract="true" inherit="bhkSerializable" module="BSHavok" versions="#BETHESDA#">
@@ -2936,11 +2936,11 @@
 
     <niobject name="bhkTransformShape" inherit="bhkShape" module="BSHavok" versions="#BETHESDA#">
         Contains a bhkShape and an additional transform for that shape.
-        <add name="Shape" type="Ref" template="bhkShape">The shape that this object transforms.</add>
-        <add name="Material" type="HavokMaterial">The material of the shape.</add>
-        <add name="Radius" type="float" />
-        <add name="Unused 01" type="byte" arr1="8" binary="true" />
-        <add name="Transform" type="Matrix44">A transform matrix.</add>
+        <field name="Shape" type="Ref" template="bhkShape">The shape that this object transforms.</field>
+        <field name="Material" type="HavokMaterial">The material of the shape.</field>
+        <field name="Radius" type="float" />
+        <field name="Unused 01" type="byte" arr1="8" binary="true" />
+        <field name="Transform" type="Matrix44">A transform matrix.</field>
     </niobject>
 
     <niobject name="bhkConvexShapeBase" abstract="true" inherit="bhkShape" module="BSHavok" versions="#BETHESDA#">
@@ -2949,26 +2949,26 @@
 
     <niobject name="bhkSphereRepShape" abstract="true" inherit="bhkConvexShapeBase" module="BSHavok" versions="#BETHESDA#">
         An interface that produces a set of spheres that represent a simplified version of the shape.
-        <add name="Material" type="HavokMaterial">The material of the shape.</add>
+        <field name="Material" type="HavokMaterial">The material of the shape.</field>
     </niobject>
 
     <niobject name="bhkConvexShape" abstract="true" inherit="bhkSphereRepShape" module="BSHavok" versions="#BETHESDA#">
         An interface that allows testing convex sets using the GJK algorithm. Also holds a radius value for creating a shell.
-        <add name="Radius" type="float" default="0.05">The radius is used to create a thin shell that is used as the shape surface.</add>
+        <field name="Radius" type="float" default="0.05">The radius is used to create a thin shell that is used as the shape surface.</field>
     </niobject>
 
     <niobject name="bhkHeightFieldShape" abstract="true" inherit="bhkShape" module="BSHavok" versions="#BETHESDA#">
         An interface for a shape which can collide with an array of spheres.
-        <add name="Material" type="HavokMaterial">The material of the shape.</add>
+        <field name="Material" type="HavokMaterial">The material of the shape.</field>
     </niobject>
 
     <niobject name="bhkPlaneShape" inherit="bhkHeightFieldShape" module="BSHavok" versions="#BETHESDA#">
         Contains a normal and distance from the origin, bounded by a given AABB.
-        <add name="Unused 01" type="byte" arr1="12" binary="true" />
-        <add name="Plane Normal" type="Vector3" />
-        <add name="Plane Constant" type="float">Distance from the origin to the plane.</add>
-        <add name="AABB Half Extents" type="Vector4" />
-        <add name="AABB Center" type="Vector4" />
+        <field name="Unused 01" type="byte" arr1="12" binary="true" />
+        <field name="Plane Normal" type="Vector3" />
+        <field name="Plane Constant" type="float">Distance from the origin to the plane.</field>
+        <field name="AABB Half Extents" type="Vector4" />
+        <field name="AABB Center" type="Vector4" />
     </niobject>
 
     <niobject name="bhkSphereShape" inherit="bhkConvexShape" module="BSHavok" versions="#BETHESDA#">
@@ -2977,56 +2977,56 @@
 
     <niobject name="bhkCylinderShape" inherit="bhkConvexShape" module="BSHavok" versions="#BETHESDA#">
         A cylinder.
-        <add name="Unused 01" type="byte" arr1="8" binary="true" />
-        <add name="Vertex A" type="Vector4" />
-        <add name="Vertex B" type="Vector4" />
-        <add name="Cylinder Radius" type="float" />
-        <add name="Unused 02" type="byte" arr1="12" binary="true" />
+        <field name="Unused 01" type="byte" arr1="8" binary="true" />
+        <field name="Vertex A" type="Vector4" />
+        <field name="Vertex B" type="Vector4" />
+        <field name="Cylinder Radius" type="float" />
+        <field name="Unused 02" type="byte" arr1="12" binary="true" />
     </niobject>
 
     <niobject name="bhkCapsuleShape" inherit="bhkConvexShape" module="BSHavok" versions="#BETHESDA#">
         A capsule.
-        <add name="Unused 01" type="byte" arr1="8" binary="true" />
-        <add name="First Point" type="Vector3">First point on the capsule's axis.</add>
-        <add name="Radius 1" type="float">Matches first capsule radius.</add>
-        <add name="Second Point" type="Vector3">Second point on the capsule's axis.</add>
-        <add name="Radius 2" type="float">Matches second capsule radius.</add>
+        <field name="Unused 01" type="byte" arr1="8" binary="true" />
+        <field name="First Point" type="Vector3">First point on the capsule's axis.</field>
+        <field name="Radius 1" type="float">Matches first capsule radius.</field>
+        <field name="Second Point" type="Vector3">Second point on the capsule's axis.</field>
+        <field name="Radius 2" type="float">Matches second capsule radius.</field>
     </niobject>
 
     <niobject name="bhkBoxShape" inherit="bhkConvexShape" module="BSHavok" versions="#BETHESDA#">
         A box.
-        <add name="Unused 01" type="byte" arr1="8" binary="true" />
-        <add name="Dimensions" type="Vector3">A cube stored in Half Extents. A unit cube (1.0, 1.0, 1.0) would be stored as 0.5, 0.5, 0.5.</add>
-        <add name="Unused Float" type="float">Unused as Havok stores the Half Extents as hkVector4 with the W component unused.</add>
+        <field name="Unused 01" type="byte" arr1="8" binary="true" />
+        <field name="Dimensions" type="Vector3">A cube stored in Half Extents. A unit cube (1.0, 1.0, 1.0) would be stored as 0.5, 0.5, 0.5.</field>
+        <field name="Unused Float" type="float">Unused as Havok stores the Half Extents as hkVector4 with the W component unused.</field>
     </niobject>
 
     <niobject name="bhkConvexVerticesShape" inherit="bhkConvexShape" module="BSHavok" versions="#BETHESDA#">
         A convex shape built from vertices. Note that if the shape is used in
         a non-static object (such as clutter), then they will simply fall
         through ground when they are under a bhkListShape.
-        <add name="Vertices Property" type="bhkWorldObjCInfoProperty" />
-        <add name="Normals Property" type="bhkWorldObjCInfoProperty" />
-        <add name="Num Vertices" type="uint">Number of vertices.</add>
-        <add name="Vertices" type="Vector4" arr1="Num Vertices">Vertices. Fourth component is 0. Lexicographically sorted.</add>
-        <add name="Num Normals" type="uint">The number of half spaces.</add>
-        <add name="Normals" type="Vector4" arr1="Num Normals">Half spaces as determined by the set of vertices above. First three components define the normal pointing to the exterior, fourth component is the signed distance of the separating plane to the origin: it is minus the dot product of v and n, where v is any vertex on the separating plane, and n is the normal. Lexicographically sorted.</add>
+        <field name="Vertices Property" type="bhkWorldObjCInfoProperty" />
+        <field name="Normals Property" type="bhkWorldObjCInfoProperty" />
+        <field name="Num Vertices" type="uint">Number of vertices.</field>
+        <field name="Vertices" type="Vector4" arr1="Num Vertices">Vertices. Fourth component is 0. Lexicographically sorted.</field>
+        <field name="Num Normals" type="uint">The number of half spaces.</field>
+        <field name="Normals" type="Vector4" arr1="Num Normals">Half spaces as determined by the set of vertices above. First three components define the normal pointing to the exterior, fourth component is the signed distance of the separating plane to the origin: it is minus the dot product of v and n, where v is any vertex on the separating plane, and n is the normal. Lexicographically sorted.</field>
     </niobject>
 
     <niobject name="bhkConvexTransformShape" inherit="bhkConvexShapeBase" module="BSHavok" versions="#BETHESDA#">
         Contains a bhkConvexShape and an additional transform for that shape.
         The advantage of using bhkConvexTransformShape over bhkTransformShape is that it does not require additional agents to be created as it is itself convex.
-        <add name="Shape" type="Ref" template="bhkConvexShape">The shape that this object transforms.</add>
-        <add name="Material" type="HavokMaterial">The material of the shape.</add>
-        <add name="Radius" type="float" />
-        <add name="Unused 01" type="byte" arr1="8" binary="true" />
-        <add name="Transform" type="Matrix44">A transform matrix.</add>
+        <field name="Shape" type="Ref" template="bhkConvexShape">The shape that this object transforms.</field>
+        <field name="Material" type="HavokMaterial">The material of the shape.</field>
+        <field name="Radius" type="float" />
+        <field name="Unused 01" type="byte" arr1="8" binary="true" />
+        <field name="Transform" type="Matrix44">A transform matrix.</field>
     </niobject>
 
     <niobject name="bhkConvexSweepShape" inherit="bhkConvexShapeBase" module="BSHavok" versions="V10_0_1_0">
-        <add name="Shape" type="Ref" template="bhkConvexShape" />
-        <add name="Material" type="HavokMaterial" />
-        <add name="Radius" type="float" />
-        <add name="Unknown" type="Vector3" />
+        <field name="Shape" type="Ref" template="bhkConvexShape" />
+        <field name="Material" type="HavokMaterial" />
+        <field name="Radius" type="float" />
+        <field name="Unknown" type="Vector3" />
     </niobject>
 
     <niobject name="bhkMultiSphereShape" inherit="bhkSphereRepShape" module="BSHavok" versions="#BETHESDA#">
@@ -3034,33 +3034,33 @@
         However, if two bhkMultiSphereShape collide, every sphere needs to be checked against every other sphere.
             Example: 10 spheres colliding with 10 spheres will result in 100 collision checks.
             Therefore shapes like bhkCapsuleShape or bhkConvexVerticesShape should be preferred.
-        <add name="Shape Property" type="bhkWorldObjCInfoProperty" />
-        <add name="Num Spheres" type="uint" default="2" range="1:8" />
-        <add name="Spheres" type="NiBound" arr1="Num Spheres">The spheres which make up the multi sphere shape. Max of 8.</add>
+        <field name="Shape Property" type="bhkWorldObjCInfoProperty" />
+        <field name="Num Spheres" type="uint" default="2" range="1:8" />
+        <field name="Spheres" type="NiBound" arr1="Num Spheres">The spheres which make up the multi sphere shape. Max of 8.</field>
     </niobject>
 
     <niobject name="bhkBvTreeShape" abstract="true" inherit="bhkShape" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpBvTreeShape. hkpBvTreeShape adds a bounding volume tree to an hkpShapeCollection.
         A bounding volume tree is useful for testing collision between a moving object and large static geometry.
-        <add name="Shape" type="Ref" template="bhkShape">The shape.</add>
+        <field name="Shape" type="Ref" template="bhkShape">The shape.</field>
     </niobject>
 
     <compound name="hkpMoppCode" versions="#BETHESDA#">
-        <add name="Data Size" type="uint">Number of bytes for MOPP data.</add>
-        <add name="Offset" type="Vector4" ver1="10.1.0.0">
+        <field name="Data Size" type="uint">Number of bytes for MOPP data.</field>
+        <field name="Offset" type="Vector4" ver1="10.1.0.0">
             XYZ: Origin of the object in mopp coordinates. This is the minimum of all vertices in the packed shape along each axis, minus 0.1.
             W: The scaling factor to quantize the MOPP: the quantization factor is equal to 256*256 divided by this number.
                In Oblivion files, scale is taken equal to 256*256*254 / (size + 0.2) where size is the largest dimension of the bounding box of the packed shape.
-        </add>
-        <add name="Build Type" type="hkMoppCodeBuildType" vercond="#BS_GT_FO3#">Tells if MOPP Data was organized into smaller chunks (PS3) or not (PC)</add>
-        <add name="Data" type="byte" binary="true" arr1="Data Size">The tree of bounding volume data.</add>
+        </field>
+        <field name="Build Type" type="hkMoppCodeBuildType" vercond="#BS_GT_FO3#">Tells if MOPP Data was organized into smaller chunks (PS3) or not (PC)</field>
+        <field name="Data" type="byte" binary="true" arr1="Data Size">The tree of bounding volume data.</field>
     </compound>
 
     <niobject name="bhkMoppBvTreeShape" inherit="bhkBvTreeShape" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpMoppBvTreeShape. hkpMoppBvTreeShape is a bounding volume tree using Havok-proprietary MOPP code.
-        <add name="Unused 01" type="byte" arr1="12" binary="true" />
-        <add name="Scale" type="float" default="1.0" />
-        <add name="MOPP Code" type="hkpMoppCode" />
+        <field name="Unused 01" type="byte" arr1="12" binary="true" />
+        <field name="Scale" type="float" default="1.0" />
+        <field name="MOPP Code" type="hkpMoppCode" />
     </niobject>
 
 
@@ -3073,62 +3073,62 @@
 
         Shapes collected in a bhkListShape may not have the correct collision sound/FX due to HavokMaterial issues.
         Do not put a bhkPackedNiTriStripsShape in the Sub Shapes. Use a separate collision nodes without a list shape for those.
-        <add name="Num Sub Shapes" type="uint" default="1" range="1:256" />
-        <add name="Sub Shapes" type="Ref" template="bhkShape" arr1="Num Sub Shapes">List of shapes. Max of 256.</add>
-        <add name="Material" type="HavokMaterial">The material of the shape.</add>
-        <add name="Child Shape Property" type="bhkWorldObjCInfoProperty" />
-        <add name="Child Filter Property" type="bhkWorldObjCInfoProperty" />
-        <add name="Num Filters" type="uint" calc="#LEN[Sub Shapes]#" />
-        <add name="Filters" type="HavokFilter" arr1="Num Filters">Always zeroed. Seemingly unused, or 0 for all values means no override.</add>
+        <field name="Num Sub Shapes" type="uint" default="1" range="1:256" />
+        <field name="Sub Shapes" type="Ref" template="bhkShape" arr1="Num Sub Shapes">List of shapes. Max of 256.</field>
+        <field name="Material" type="HavokMaterial">The material of the shape.</field>
+        <field name="Child Shape Property" type="bhkWorldObjCInfoProperty" />
+        <field name="Child Filter Property" type="bhkWorldObjCInfoProperty" />
+        <field name="Num Filters" type="uint" calc="#LEN[Sub Shapes]#" />
+        <field name="Filters" type="HavokFilter" arr1="Num Filters">Always zeroed. Seemingly unused, or 0 for all values means no override.</field>
     </niobject>
 
     <niobject name="bhkMeshShape" inherit="bhkShape" module="BSHavok" versions="V10_0_1_0">
         Bethesda extension of hkpMeshShape, but using NiTriStripsData instead of Havok storage.
         Appears in one old Oblivion NIF, but only in certain distributions. NIF version 10.0.1.0 only.
-        <add name="Unknown 01" type="uint" arr1="2" />
-        <add name="Radius" type="float" />
-        <add name="Unknown 02" type="uint" arr1="2" />
-        <add name="Scale" type="Vector4" />
-        <add name="Num Shape Properties" type="uint" />
-        <add name="Shape Properties" type="bhkWorldObjCInfoProperty" arr1="Num Shape Properties" />
-        <add name="Unknown 03" type="uint" arr1="3" />
-        <add name="Num Strips Data" type="uint" ver2="10.0.1.0" />
-        <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data" ver2="10.0.1.0" />
+        <field name="Unknown 01" type="uint" arr1="2" />
+        <field name="Radius" type="float" />
+        <field name="Unknown 02" type="uint" arr1="2" />
+        <field name="Scale" type="Vector4" />
+        <field name="Num Shape Properties" type="uint" />
+        <field name="Shape Properties" type="bhkWorldObjCInfoProperty" arr1="Num Shape Properties" />
+        <field name="Unknown 03" type="uint" arr1="3" />
+        <field name="Num Strips Data" type="uint" ver2="10.0.1.0" />
+        <field name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data" ver2="10.0.1.0" />
     </niobject>
 
     <niobject name="bhkPackedNiTriStripsShape" inherit="bhkShapeCollection" module="BSHavok" versions="#BETHESDA#">
         Bethesda custom hkpShapeCollection using custom packed tri strips data.
-        <add name="Num Sub Shapes" type="ushort" ver2="20.0.0.5" />
-        <add name="Sub Shapes" type="hkSubPartData" arr1="Num Sub Shapes" ver2="20.0.0.5" />
-        <add name="User Data" type="uint" default="0" />
-        <add name="Unused 01" type="byte" arr1="4" binary="true" />
-        <add name="Radius" type="float" default="0.1" />
-        <add name="Unused 02" type="byte" arr1="4" binary="true" />
-        <add name="Scale" type="Vector4" default="#VEC4_1110#" />
-        <add name="Radius Copy" type="float" default="0.1">Same as radius</add>
-        <add name="Scale Copy" type="Vector4" default="#VEC4_1110#">Same as scale.</add>
-        <add name="Data" type="Ref" template="hkPackedNiTriStripsData" />
+        <field name="Num Sub Shapes" type="ushort" ver2="20.0.0.5" />
+        <field name="Sub Shapes" type="hkSubPartData" arr1="Num Sub Shapes" ver2="20.0.0.5" />
+        <field name="User Data" type="uint" default="0" />
+        <field name="Unused 01" type="byte" arr1="4" binary="true" />
+        <field name="Radius" type="float" default="0.1" />
+        <field name="Unused 02" type="byte" arr1="4" binary="true" />
+        <field name="Scale" type="Vector4" default="#VEC4_1110#" />
+        <field name="Radius Copy" type="float" default="0.1">Same as radius</field>
+        <field name="Scale Copy" type="Vector4" default="#VEC4_1110#">Same as scale.</field>
+        <field name="Data" type="Ref" template="hkPackedNiTriStripsData" />
     </niobject>
 
     <niobject name="bhkNiTriStripsShape" inherit="bhkShapeCollection" module="BSHavok" versions="#BETHESDA#">
         Bethesda custom hkpShapeCollection using NiTriStripsData for geometry storage.
-        <add name="Material" type="HavokMaterial">The material of the shape.</add>
-        <add name="Radius" type="float" default="0.1" />
-        <add name="Unused 01" type="byte" arr1="20" binary="true" />
-        <add name="Grow By" type="uint" default="1" />
-        <add name="Scale" type="Vector4" default="#VEC4_1110#" ver1="10.1.0.0" />
-        <add name="Num Strips Data" type="uint" default="1" />
-        <add name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data" />
-        <add name="Num Filters" type="uint" default="1" calc="#LEN[Strips Data]#" />
-        <add name="Filters" type="HavokFilter" arr1="Num Filters" />
+        <field name="Material" type="HavokMaterial">The material of the shape.</field>
+        <field name="Radius" type="float" default="0.1" />
+        <field name="Unused 01" type="byte" arr1="20" binary="true" />
+        <field name="Grow By" type="uint" default="1" />
+        <field name="Scale" type="Vector4" default="#VEC4_1110#" ver1="10.1.0.0" />
+        <field name="Num Strips Data" type="uint" default="1" />
+        <field name="Strips Data" type="Ref" template="NiTriStripsData" arr1="Num Strips Data" />
+        <field name="Num Filters" type="uint" default="1" calc="#LEN[Strips Data]#" />
+        <field name="Filters" type="HavokFilter" arr1="Num Filters" />
     </niobject>
 
     <niobject name="NiExtraData" inherit="NiObject" module="NiMain">
         A generic extra data object.
-        <add name="Name" type="string" ver1="10.0.1.0" excludeT="BSExtraData">Name of this object.</add>
-        <add name="Next Extra Data" type="Ref" template="NiExtraData" ver2="4.2.2.0">Block number of the next extra data object.</add>
-        <add name="Extra Data" type="ByteArray" ver2="3.3.0.13">The extra data was sometimes stored as binary directly on NiExtraData.</add>
-        <add name="Num Bytes" type="uint" ver1="4.0.0.0" ver2="4.2.2.0">Ignore binary data after 4.x as the child block will cover it.</add>
+        <field name="Name" type="string" ver1="10.0.1.0" excludeT="BSExtraData">Name of this object.</field>
+        <field name="Next Extra Data" type="Ref" template="NiExtraData" ver2="4.2.2.0">Block number of the next extra data object.</field>
+        <field name="Extra Data" type="ByteArray" ver2="3.3.0.13">The extra data was sometimes stored as binary directly on NiExtraData.</field>
+        <field name="Num Bytes" type="uint" ver1="4.0.0.0" ver2="4.2.2.0">Ignore binary data after 4.x as the child block will cover it.</field>
     </niobject>
 
     <niobject name="NiInterpolator" abstract="true" inherit="NiObject" module="NiAnimation">
@@ -3141,26 +3141,26 @@
 
     <niobject name="NiColorInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         Animates a color value over time.
-        <add name="Value" type="Color4" default="#INV_VEC4#" />
-        <add name="Data" type="Ref" template="NiColorData" />
+        <field name="Value" type="Color4" default="#INV_VEC4#" />
+        <field name="Data" type="Ref" template="NiColorData" />
     </niobject>
 
     <niobject name="NiFloatInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         Uses NiFloatKeys to animate a float value over time.
-        <add name="Value" type="float" default="#INV_FLT#">Pose value if lacking NiFloatData.</add>
-        <add name="Data" type="Ref" template="NiFloatData" />
+        <field name="Value" type="float" default="#INV_FLT#">Pose value if lacking NiFloatData.</field>
+        <field name="Data" type="Ref" template="NiFloatData" />
     </niobject>
 
     <niobject name="NiTransformInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         An interpolator for transform keyframes.
-        <add name="Transform" type="NiQuatTransform" />
-        <add name="Data" type="Ref" template="NiTransformData" />
+        <field name="Transform" type="NiQuatTransform" />
+        <field name="Data" type="Ref" template="NiTransformData" />
     </niobject>
 
     <niobject name="NiPoint3Interpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         Uses NiPosKeys to animate an NiPoint3 value over time.
-        <add name="Value" type="Vector3" default="#INV_VEC3#">Pose value if lacking NiPosData.</add>
-        <add name="Data" type="Ref" template="NiPosData" />
+        <field name="Value" type="Vector3" default="#INV_VEC3#">Pose value if lacking NiPosData.</field>
+        <field name="Data" type="Ref" template="NiPosData" />
     </niobject>
 
     <bitflags name="PathFlags" storage="ushort" prefix="NIPI">
@@ -3175,19 +3175,19 @@
 
     <niobject name="NiPathInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         Used to make an object follow a predefined spline path.
-        <add name="Flags" type="PathFlags" default="3" />
-        <add name="Bank Dir" type="int" default="1">-1 = Negative, 1 = Positive</add>
-        <add name="Max Bank Angle" type="float">Max angle in radians.</add>
-        <add name="Smoothing" type="float" />
-        <add name="Follow Axis" type="short">0, 1, or 2 representing X, Y, or Z.</add>
-        <add name="Path Data" type="Ref" template="NiPosData" />
-        <add name="Percent Data" type="Ref" template="NiFloatData" />
+        <field name="Flags" type="PathFlags" default="3" />
+        <field name="Bank Dir" type="int" default="1">-1 = Negative, 1 = Positive</field>
+        <field name="Max Bank Angle" type="float">Max angle in radians.</field>
+        <field name="Smoothing" type="float" />
+        <field name="Follow Axis" type="short">0, 1, or 2 representing X, Y, or Z.</field>
+        <field name="Path Data" type="Ref" template="NiPosData" />
+        <field name="Percent Data" type="Ref" template="NiFloatData" />
     </niobject>
 
     <niobject name="NiBoolInterpolator" inherit="NiKeyBasedInterpolator" module="NiAnimation">
         Uses NiBoolKeys to animate a bool value over time.
-        <add name="Value" type="bool" default="2">Pose value if lacking NiBoolData.</add>
-        <add name="Data" type="Ref" template="NiBoolData" />
+        <field name="Value" type="bool" default="2">Pose value if lacking NiBoolData.</field>
+        <field name="Data" type="Ref" template="NiBoolData" />
     </niobject>
 
     <niobject name="NiBoolTimelineInterpolator" inherit="NiBoolInterpolator" module="NiAnimation">
@@ -3201,74 +3201,74 @@
 
     <compound name="InterpBlendItem">
         Interpolator item for array in NiBlendInterpolator.
-        <add name="Interpolator" type="Ref" template="NiInterpolator">Reference to an interpolator.</add>
-        <add name="Weight" type="float" />
-        <add name="Normalized Weight" type="float" />
-        <add name="Priority" type="int" ver2="10.1.0.109" />
-        <add name="Priority" type="byte" ver1="10.1.0.110" />
-        <add name="Ease Spinner" type="float" />
+        <field name="Interpolator" type="Ref" template="NiInterpolator">Reference to an interpolator.</field>
+        <field name="Weight" type="float" />
+        <field name="Normalized Weight" type="float" />
+        <field name="Priority" type="int" ver2="10.1.0.109" />
+        <field name="Priority" type="byte" ver1="10.1.0.110" />
+        <field name="Ease Spinner" type="float" />
     </compound>
 
     <niobject name="NiBlendInterpolator" abstract="true" inherit="NiInterpolator" module="NiAnimation">
         Abstract base class for all NiInterpolators that blend the results of sub-interpolators together to compute a final weighted value.
-        <add name="Flags" type="InterpBlendFlags" ver1="10.1.0.112" />
-        <add name="Array Size" type="ushort" ver2="10.1.0.109" />
-        <add name="Array Grow By" type="ushort" ver2="10.1.0.109" />
-        <add name="Array Size" type="byte" ver1="10.1.0.110" />
-        <add name="Weight Threshold" type="float" ver1="10.1.0.112" />
+        <field name="Flags" type="InterpBlendFlags" ver1="10.1.0.112" />
+        <field name="Array Size" type="ushort" ver2="10.1.0.109" />
+        <field name="Array Grow By" type="ushort" ver2="10.1.0.109" />
+        <field name="Array Size" type="byte" ver1="10.1.0.110" />
+        <field name="Weight Threshold" type="float" ver1="10.1.0.112" />
         <!-- Flags conds -->
-        <add name="Interp Count" type="byte" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="Single Index" type="byte" default="#BYTE_MAX#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="High Priority" type="char" default="#CHAR_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="Next High Priority" type="char" default="#CHAR_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="Single Time" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="High Weights Sum" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="Next High Weights Sum" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="High Ease Spinner" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
-        <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <field name="Interp Count" type="byte" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <field name="Single Index" type="byte" default="#BYTE_MAX#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <field name="High Priority" type="char" default="#CHAR_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <field name="Next High Priority" type="char" default="#CHAR_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <field name="Single Time" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <field name="High Weights Sum" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <field name="Next High Weights Sum" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <field name="High Ease Spinner" type="float" default="#FLT_MIN#" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
+        <field name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" cond="!(Flags #BITAND# 1)" ver1="10.1.0.112" />
         <!-- /Flags conds -->
-        <add name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" ver2="10.1.0.111" />
-        <add name="Manager Controlled" type="bool" ver2="10.1.0.111" />
-        <add name="Weight Threshold" type="float" ver2="10.1.0.111" />
-        <add name="Only Use Highest Weight" type="bool" ver2="10.1.0.111" />
-        <add name="Interp Count" type="ushort" ver2="10.1.0.109" />
-        <add name="Single Index" type="ushort" default="#USHRT_MAX#" ver2="10.1.0.109" />
-        <add name="Interp Count" type="byte" ver1="10.1.0.110" ver2="10.1.0.111" />
-        <add name="Single Index" type="byte" default="#BYTE_MAX#" ver1="10.1.0.110" ver2="10.1.0.111" />
-        <add name="Single Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.108" ver2="10.1.0.111" />
-        <add name="Single Time" type="float" default="#FLT_MIN#" ver1="10.1.0.108" ver2="10.1.0.111" />
-        <add name="High Priority" type="int" default="#INT_MIN#" ver2="10.1.0.109" />
-        <add name="Next High Priority" type="int" default="#INT_MIN#" ver2="10.1.0.109" />
-        <add name="High Priority" type="char" default="#CHAR_MIN#" ver1="10.1.0.110" ver2="10.1.0.111" />
-        <add name="Next High Priority" type="char" default="#CHAR_MIN#" ver1="10.1.0.110" ver2="10.1.0.111" />
+        <field name="Interp Array Items" type="InterpBlendItem" arr1="Array Size" ver2="10.1.0.111" />
+        <field name="Manager Controlled" type="bool" ver2="10.1.0.111" />
+        <field name="Weight Threshold" type="float" ver2="10.1.0.111" />
+        <field name="Only Use Highest Weight" type="bool" ver2="10.1.0.111" />
+        <field name="Interp Count" type="ushort" ver2="10.1.0.109" />
+        <field name="Single Index" type="ushort" default="#USHRT_MAX#" ver2="10.1.0.109" />
+        <field name="Interp Count" type="byte" ver1="10.1.0.110" ver2="10.1.0.111" />
+        <field name="Single Index" type="byte" default="#BYTE_MAX#" ver1="10.1.0.110" ver2="10.1.0.111" />
+        <field name="Single Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.108" ver2="10.1.0.111" />
+        <field name="Single Time" type="float" default="#FLT_MIN#" ver1="10.1.0.108" ver2="10.1.0.111" />
+        <field name="High Priority" type="int" default="#INT_MIN#" ver2="10.1.0.109" />
+        <field name="Next High Priority" type="int" default="#INT_MIN#" ver2="10.1.0.109" />
+        <field name="High Priority" type="char" default="#CHAR_MIN#" ver1="10.1.0.110" ver2="10.1.0.111" />
+        <field name="Next High Priority" type="char" default="#CHAR_MIN#" ver1="10.1.0.110" ver2="10.1.0.111" />
     </niobject>
 
     <niobject name="NiBSplineInterpolator" abstract="true" inherit="NiInterpolator" module="NiAnimation">
         Abstract base class for interpolators storing data via a B-spline.
-        <add name="Start Time" type="float" default="#FLT_MAX#">Animation start time.</add>
-        <add name="Stop Time" type="float" default="#FLT_MIN#">Animation stop time.</add>
-        <add name="Spline Data" type="Ref" template="NiBSplineData" />
-        <add name="Basis Data" type="Ref" template="NiBSplineBasisData" />
+        <field name="Start Time" type="float" default="#FLT_MAX#">Animation start time.</field>
+        <field name="Stop Time" type="float" default="#FLT_MIN#">Animation stop time.</field>
+        <field name="Spline Data" type="Ref" template="NiBSplineData" />
+        <field name="Basis Data" type="Ref" template="NiBSplineBasisData" />
     </niobject>
 
     <compound name="LegacyExtraData" until="V2_3">
         Extra Data for pre-3.0 versions
-        <add name="Has Extra Data" type="bool" />
-        <add name="Extra Prop Name" cond="Has Extra Data" type="SizedString" />
-        <add name="Extra Ref ID" cond="Has Extra Data" type="uint" />
-        <add name="Extra String" cond="Has Extra Data" type="SizedString" />
-        <add name="Unknown Byte 1" type="byte" />
+        <field name="Has Extra Data" type="bool" />
+        <field name="Extra Prop Name" cond="Has Extra Data" type="SizedString" />
+        <field name="Extra Ref ID" cond="Has Extra Data" type="uint" />
+        <field name="Extra String" cond="Has Extra Data" type="SizedString" />
+        <field name="Unknown Byte 1" type="byte" />
     </compound>
 
     <niobject name="NiObjectNET" abstract="true" inherit="NiObject" module="NiMain">
         Abstract base class for NiObjects that support names, extra data, and time controllers.
-        <add name="Shader Type" type="BSLightingShaderType" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SKY# #AND# #NI_BS_LTE_FO4#" onlyT="BSLightingShaderProperty">Configures the main shader path</add>
-        <add name="Name" type="string">Name of this controllable object, used to refer to the object in .kf files.</add>
-        <add name="Legacy Extra Data" type="LegacyExtraData" ver2="2.3" />
-        <add name="Extra Data" type="Ref" template="NiExtraData" ver1="3.0" ver2="4.2.2.0">Extra data object index. (The first in a chain)</add>
-        <add name="Num Extra Data List" type="uint" ver1="10.0.1.0">The number of Extra Data objects referenced through the list.</add>
-        <add name="Extra Data List" type="Ref" template="NiExtraData" arr1="Num Extra Data List" ver1="10.0.1.0">List of extra data indices.</add>
-        <add name="Controller" type="Ref" template="NiTimeController" ver1="3.0">Controller object index. (The first in a chain)</add>
+        <field name="Shader Type" type="BSLightingShaderType" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SKY# #AND# #NI_BS_LTE_FO4#" onlyT="BSLightingShaderProperty">Configures the main shader path</field>
+        <field name="Name" type="string">Name of this controllable object, used to refer to the object in .kf files.</field>
+        <field name="Legacy Extra Data" type="LegacyExtraData" ver2="2.3" />
+        <field name="Extra Data" type="Ref" template="NiExtraData" ver1="3.0" ver2="4.2.2.0">Extra data object index. (The first in a chain)</field>
+        <field name="Num Extra Data List" type="uint" ver1="10.0.1.0">The number of Extra Data objects referenced through the list.</field>
+        <field name="Extra Data List" type="Ref" template="NiExtraData" arr1="Num Extra Data List" ver1="10.0.1.0">List of extra data indices.</field>
+        <field name="Controller" type="Ref" template="NiTimeController" ver1="3.0">Controller object index. (The first in a chain)</field>
     </niobject>
 
     <niobject name="NiCollisionObject" inherit="NiObject" module="NiMain">
@@ -3276,15 +3276,15 @@
         is visible and possibly (if the body allows for it) interactive. The node itself
         is simple, it only has three properties.
         For this type of collision object, bhkRigidBody or bhkRigidBodyT is generally used.
-        <add name="Target" type="Ptr" template="NiAVObject">Index of the AV object referring to this collision object.</add>
+        <field name="Target" type="Ptr" template="NiAVObject">Index of the AV object referring to this collision object.</field>
     </niobject>
 
     <niobject name="NiCollisionData" inherit="NiCollisionObject" module="NiMain">
         Collision box.
-        <add name="Propagation Mode" type="PropagationMode" default="PROPAGATE_ALWAYS" />
-        <add name="Collision Mode" type="CollisionMode" default="NOTEST" ver1="10.1.0.0" />
-        <add name="Use ABV" type="byte">Use Alternate Bounding Volume.</add>
-        <add name="Bounding Volume" type="BoundingVolume" cond="Use ABV == 1" />
+        <field name="Propagation Mode" type="PropagationMode" default="PROPAGATE_ALWAYS" />
+        <field name="Collision Mode" type="CollisionMode" default="NOTEST" ver1="10.1.0.0" />
+        <field name="Use ABV" type="byte">Use Alternate Bounding Volume.</field>
+        <field name="Bounding Volume" type="BoundingVolume" cond="Use ABV == 1" />
     </niobject>
 
     <bitflags name="bhkCOFlags" storage="ushort" prefix="BHKCO" versions="#BETHESDA#">
@@ -3306,7 +3306,7 @@
 
     <niobject name="bhkNiCollisionObject" abstract="true" inherit="NiCollisionObject" module="BSHavok">
         Abstract base class to merge NiCollisionObject with Bethesda Havok.
-        <add name="Flags" type="bhkCOFlags" default="1">
+        <field name="Flags" type="bhkCOFlags" default="1">
             OB-FO3: Add 0x28 (SET_LOCAL | USE_VEL) for ANIM_STATIC layer objects.
             Post-FO3: Always add 0x80 (SYNC_ON_UPDATE).
             <default type="bhkCollisionObject" value="0x81" />
@@ -3317,8 +3317,8 @@
             <default type="bhkSPCollisionObject" value="0x1" versions="V20_2_0_7_FO3 V20_0_0_5_OBL" />
             <default type="bhkBlendCollisionObject" value="0x89" />
             <default type="bhkBlendCollisionObject" value="0x9" versions="V20_2_0_7_FO3 V20_0_0_5_OBL" />
-        </add>
-        <add name="Body" type="Ref" template="bhkWorldObject" />
+        </field>
+        <field name="Body" type="Ref" template="bhkWorldObject" />
     </niobject>
 
     <niobject name="bhkCollisionObject" inherit="bhkNiCollisionObject" module="BSHavok">
@@ -3327,10 +3327,10 @@
 
     <niobject name="bhkBlendCollisionObject" inherit="bhkCollisionObject" module="BSHavok">
         Bethesda Havok object used in skeletons.
-        <add name="Heir Gain" type="float" default="1.0" />
-        <add name="Vel Gain" type="float" default="1.0" />
-        <add name="Unknown Float 1" type="float" vercond="#BSVER# #LT# 9" />
-        <add name="Unknown Float 2" type="float" vercond="#BSVER# #LT# 9" />
+        <field name="Heir Gain" type="float" default="1.0" />
+        <field name="Vel Gain" type="float" default="1.0" />
+        <field name="Unknown Float 1" type="float" vercond="#BSVER# #LT# 9" />
+        <field name="Unknown Float 2" type="float" vercond="#BSVER# #LT# 9" />
     </niobject>
 
     <niobject name="bhkPCollisionObject" inherit="bhkNiCollisionObject" module="BSHavok">
@@ -3343,7 +3343,7 @@
 
     <niobject name="NiAVObject" abstract="true" inherit="NiObjectNET" module="NiMain">
         Abstract audio-visual base class from which all of Gamebryo's scene graph objects inherit.
-        <add name="Flags" type="uint" default="0x8000E" vercond="#BSVER# #GT# 26">
+        <field name="Flags" type="uint" default="0x8000E" vercond="#BSVER# #GT# 26">
             Basic flags for AV objects. For Bethesda streams above 26 only.
             ALL: FO4 lacks the 0x80000 flag always. Skyrim lacks it sometimes.
             BSTreeNode: 0x8080E (pre-FO4), 0x400E (FO4)
@@ -3383,38 +3383,38 @@
             <default type="BSOrderedNode" value="0x8000E" versions="V20_2_0_7_FO3" />
             <default type="BSLODTriShape" value="0x800000E" versions="V20_2_0_7_SSE" />
             <default type="BSLODTriShape" value="0x808000E" versions="V20_2_0_7_SKY" />
-        </add>
-        <add name="Flags" type="ushort" ver1="3.0" vercond="#BSVER# #LTE# 26">Basic flags for AV objects.</add>
-        <add name="Translation" type="Vector3">The translation vector.</add>
-        <add name="Rotation" type="Matrix33">The rotation part of the transformation matrix.</add>
-        <add name="Scale" type="float" default="1.0">Scaling part (only uniform scaling is supported).</add>
-        <add name="Velocity" type="Vector3" ver2="4.2.2.0">Unknown function. Always seems to be (0, 0, 0)</add>
-        <add name="Num Properties" type="uint" vercond="#NI_BS_LTE_FO3#" />
-        <add name="Properties" type="Ref" template="NiProperty" arr1="Num Properties" vercond="#NI_BS_LTE_FO3#">All rendering properties attached to this object.</add>
-        <add name="Unknown 1" type="uint" arr1="4" ver2="2.3" />
-        <add name="Unknown 2" type="byte" ver2="2.3" />
-        <add name="Has Bounding Volume" type="bool" ver1="3.0" ver2="4.2.2.0" />
-        <add name="Bounding Volume" type="BoundingVolume" cond="Has Bounding Volume" ver1="3.0" ver2="4.2.2.0" />
-        <add name="Collision Object" type="Ref" template="NiCollisionObject" ver1="10.0.1.0" />
+        </field>
+        <field name="Flags" type="ushort" ver1="3.0" vercond="#BSVER# #LTE# 26">Basic flags for AV objects.</field>
+        <field name="Translation" type="Vector3">The translation vector.</field>
+        <field name="Rotation" type="Matrix33">The rotation part of the transformation matrix.</field>
+        <field name="Scale" type="float" default="1.0">Scaling part (only uniform scaling is supported).</field>
+        <field name="Velocity" type="Vector3" ver2="4.2.2.0">Unknown function. Always seems to be (0, 0, 0)</field>
+        <field name="Num Properties" type="uint" vercond="#NI_BS_LTE_FO3#" />
+        <field name="Properties" type="Ref" template="NiProperty" arr1="Num Properties" vercond="#NI_BS_LTE_FO3#">All rendering properties attached to this object.</field>
+        <field name="Unknown 1" type="uint" arr1="4" ver2="2.3" />
+        <field name="Unknown 2" type="byte" ver2="2.3" />
+        <field name="Has Bounding Volume" type="bool" ver1="3.0" ver2="4.2.2.0" />
+        <field name="Bounding Volume" type="BoundingVolume" cond="Has Bounding Volume" ver1="3.0" ver2="4.2.2.0" />
+        <field name="Collision Object" type="Ref" template="NiCollisionObject" ver1="10.0.1.0" />
     </niobject>
 
     <niobject name="NiDynamicEffect" abstract="true" inherit="NiAVObject" module="NiMain">
         Abstract base class for dynamic effects such as NiLights or projected texture effects.
-        <add name="Switch State" type="bool" default="1" ver1="10.1.0.106" vercond="#NI_BS_LT_FO4#">If true, then the dynamic effect is applied to affected nodes during rendering.</add>
-        <add name="Num Affected Nodes" type="uint" ver2="4.0.0.2" />
-        <add name="Affected Nodes" type="Ptr" template="NiNode" arr1="Num Affected Nodes" ver2="3.3.0.13">If a node appears in this list, then its entire subtree will be affected by the effect.</add>
-        <add name="Affected Node Pointers" type="uint" arr1="Num Affected Nodes" ver1="4.0.0.0" ver2="4.0.0.2">As of 4.0 the pointer hash is no longer stored alongside each NiObject on disk, yet this node list still refers to the pointer hashes. Cannot leave the type as Ptr because the link will be invalid.</add>
-        <add name="Num Affected Nodes" type="uint" ver1="10.1.0.0" vercond="#NI_BS_LT_FO4#" />
-        <add name="Affected Nodes" type="Ptr" template="NiNode" arr1="Num Affected Nodes" ver1="10.1.0.0" vercond="#NI_BS_LT_FO4#">If a node appears in this list, then its entire subtree will be affected by the effect.</add>
+        <field name="Switch State" type="bool" default="1" ver1="10.1.0.106" vercond="#NI_BS_LT_FO4#">If true, then the dynamic effect is applied to affected nodes during rendering.</field>
+        <field name="Num Affected Nodes" type="uint" ver2="4.0.0.2" />
+        <field name="Affected Nodes" type="Ptr" template="NiNode" arr1="Num Affected Nodes" ver2="3.3.0.13">If a node appears in this list, then its entire subtree will be affected by the effect.</field>
+        <field name="Affected Node Pointers" type="uint" arr1="Num Affected Nodes" ver1="4.0.0.0" ver2="4.0.0.2">As of 4.0 the pointer hash is no longer stored alongside each NiObject on disk, yet this node list still refers to the pointer hashes. Cannot leave the type as Ptr because the link will be invalid.</field>
+        <field name="Num Affected Nodes" type="uint" ver1="10.1.0.0" vercond="#NI_BS_LT_FO4#" />
+        <field name="Affected Nodes" type="Ptr" template="NiNode" arr1="Num Affected Nodes" ver1="10.1.0.0" vercond="#NI_BS_LT_FO4#">If a node appears in this list, then its entire subtree will be affected by the effect.</field>
     </niobject>
 
     <niobject name="NiLight" abstract="true" inherit="NiDynamicEffect" module="NiMain">
         Abstract base class that represents light sources in a scene graph.
         For Bethesda Stream 130 (FO4), NiLight now directly inherits from NiAVObject.
-        <add name="Dimmer" type="float" default="1.0">Scales the overall brightness of all light components.</add>
-        <add name="Ambient Color" type="Color3" default="#VEC3_ZERO#" />
-        <add name="Diffuse Color" type="Color3" default="#VEC3_ZERO#" />
-        <add name="Specular Color" type="Color3" default="#VEC3_ZERO#" />
+        <field name="Dimmer" type="float" default="1.0">Scales the overall brightness of all light components.</field>
+        <field name="Ambient Color" type="Color3" default="#VEC3_ZERO#" />
+        <field name="Diffuse Color" type="Color3" default="#VEC3_ZERO#" />
+        <field name="Specular Color" type="Color3" default="#VEC3_ZERO#" />
     </niobject>
 
     <niobject name="NiProperty" abstract="true" inherit="NiObjectNET" module="NiMain">
@@ -3423,7 +3423,7 @@
 
     <niobject name="NiTransparentProperty" inherit="NiProperty" module="NiLegacy">
         Unknown
-        <add name="Unknown" type="byte" arr1="6" />
+        <field name="Unknown" type="byte" arr1="6" />
     </niobject>
 
     <enum name="NiPSysModifierOrder" storage="uint">
@@ -3446,8 +3446,8 @@
 
     <niobject name="NiPSysModifier" abstract="true" inherit="NiObject" module="NiParticle">
         Abstract base class for all particle system modifiers.
-        <add name="Name" type="string">Used to locate the modifier.</add>
-        <add name="Order" type="NiPSysModifierOrder" default="ORDER_GENERAL">
+        <field name="Name" type="string">Used to locate the modifier.</field>
+        <field name="Order" type="NiPSysModifierOrder" default="ORDER_GENERAL">
             Modifier's priority in the particle modifier chain.
             <default type="NiPSysAgeDeathModifier" value="ORDER_KILLOLDPARTICLES" />
             <default type="NiPSysMeshEmitter" value="ORDER_EMITTER" />
@@ -3475,66 +3475,66 @@
             <default type="BSPSysStripUpdateModifier" value="ORDER_FO3_BSSTRIPUPDATE" versions="V20_2_0_7_FO3" />
             <default type="BSPSysStripUpdateModifier" value="ORDER_SK_BSSTRIPUPDATE" versions="V20_2_0_7_SKY V20_2_0_7_SSE" />
             <default type="NiPSysPartSpawnModifier" value="ORDER_WORLDSHIFT_PARTSPAWN" />
-        </add>
-        <add name="Target" type="Ptr" template="NiParticleSystem">NiParticleSystem parent of this modifier.</add>
-        <add name="Active" type="bool" default="1">Whether or not the modifier is active.</add>
+        </field>
+        <field name="Target" type="Ptr" template="NiParticleSystem">NiParticleSystem parent of this modifier.</field>
+        <field name="Active" type="bool" default="1">Whether or not the modifier is active.</field>
     </niobject>
 
     <niobject name="NiPSysEmitter" abstract="true" inherit="NiPSysModifier" module="NiParticle">
         Abstract base class for all particle system emitters.
-        <add name="Speed" type="float">Speed / Inertia of particle movement.</add>
-        <add name="Speed Variation" type="float">Adds an amount of randomness to Speed.</add>
-        <add name="Declination" type="float">Declination / First axis.</add>
-        <add name="Declination Variation" type="float">Declination randomness / First axis.</add>
-        <add name="Planar Angle" type="float">Planar Angle / Second axis.</add>
-        <add name="Planar Angle Variation" type="float">Planar Angle randomness / Second axis .</add>
-        <add name="Initial Color" type="Color4" default="#VEC4_ONE#">Defines color of a birthed particle.</add>
-        <add name="Initial Radius" type="float" default="1.0">Size of a birthed particle.</add>
-        <add name="Radius Variation" type="float" ver1="10.4.0.1">Particle Radius randomness.</add>
-        <add name="Life Span" type="float">Duration until a particle dies.</add>
-        <add name="Life Span Variation" type="float">Adds randomness to Life Span.</add>
+        <field name="Speed" type="float">Speed / Inertia of particle movement.</field>
+        <field name="Speed Variation" type="float">Adds an amount of randomness to Speed.</field>
+        <field name="Declination" type="float">Declination / First axis.</field>
+        <field name="Declination Variation" type="float">Declination randomness / First axis.</field>
+        <field name="Planar Angle" type="float">Planar Angle / Second axis.</field>
+        <field name="Planar Angle Variation" type="float">Planar Angle randomness / Second axis .</field>
+        <field name="Initial Color" type="Color4" default="#VEC4_ONE#">Defines color of a birthed particle.</field>
+        <field name="Initial Radius" type="float" default="1.0">Size of a birthed particle.</field>
+        <field name="Radius Variation" type="float" ver1="10.4.0.1">Particle Radius randomness.</field>
+        <field name="Life Span" type="float">Duration until a particle dies.</field>
+        <field name="Life Span Variation" type="float">Adds randomness to Life Span.</field>
     </niobject>
 
     <niobject name="NiPSysVolumeEmitter" abstract="true" inherit="NiPSysEmitter" module="NiParticle">
         Abstract base class for particle emitters that emit particles from a volume.
-        <add name="Emitter Object" type="Ptr" template="NiNode" ver1="10.1.0.0">Node parent of this modifier?</add>
+        <field name="Emitter Object" type="Ptr" template="NiNode" ver1="10.1.0.0">Node parent of this modifier?</field>
     </niobject>
 
     <niobject name="NiTimeController" abstract="true" inherit="NiObject" module="NiMain">
         Abstract base class that provides the base timing and update functionality for all the Gamebryo animation controllers.
-        <add name="Next Controller" type="Ref" template="NiTimeController">Index of the next controller.</add>
-        <add name="Flags" type="TimeControllerFlags" default="76" />
-        <add name="Frequency" type="float" default="1.0">Frequency (is usually 1.0).</add>
-        <add name="Phase" type="float">Phase (usually 0.0).</add>
-        <add name="Start Time" type="float" default="#FLT_MAX#">Controller start time.</add>
-        <add name="Stop Time" type="float" default="#FLT_MIN#">Controller stop time.</add>
-        <add name="Target" type="Ptr" template="NiObjectNET" ver1="3.3.0.13">Controller target (object index of the first controllable ancestor of this object).</add>
-        <add name="Unknown Integer" type="uint" ver2="3.1" />
+        <field name="Next Controller" type="Ref" template="NiTimeController">Index of the next controller.</field>
+        <field name="Flags" type="TimeControllerFlags" default="76" />
+        <field name="Frequency" type="float" default="1.0">Frequency (is usually 1.0).</field>
+        <field name="Phase" type="float">Phase (usually 0.0).</field>
+        <field name="Start Time" type="float" default="#FLT_MAX#">Controller start time.</field>
+        <field name="Stop Time" type="float" default="#FLT_MIN#">Controller stop time.</field>
+        <field name="Target" type="Ptr" template="NiObjectNET" ver1="3.3.0.13">Controller target (object index of the first controllable ancestor of this object).</field>
+        <field name="Unknown Integer" type="uint" ver2="3.1" />
     </niobject>
 
 
     <niobject name="NiInterpController" abstract="true" inherit="NiTimeController" module="NiAnimation">
         Abstract base class for all NiTimeController objects using NiInterpolator objects to animate their target objects.
-        <add name="Manager Controlled" type="bool" ver1="10.1.0.104" ver2="10.1.0.108" />
+        <field name="Manager Controlled" type="bool" ver1="10.1.0.104" ver2="10.1.0.108" />
     </niobject>
 
     <niobject name="NiMultiTargetTransformController" inherit="NiInterpController" module="NiAnimation">
         DEPRECATED (20.6)
-        <add name="Num Extra Targets" type="ushort">The number of target pointers that follow.</add>
-        <add name="Extra Targets" type="Ptr" template="NiAVObject" arr1="Num Extra Targets">NiNode Targets to be controlled.</add>
+        <field name="Num Extra Targets" type="ushort">The number of target pointers that follow.</field>
+        <field name="Extra Targets" type="Ptr" template="NiAVObject" arr1="Num Extra Targets">NiNode Targets to be controlled.</field>
     </niobject>
 
     <niobject name="NiGeomMorpherController" inherit="NiInterpController" module="NiAnimation">
         DEPRECATED (20.5), replaced by NiMorphMeshModifier.
         Time controller for geometry morphing.
-        <add name="Morpher Flags" type="GeomMorpherFlags" ver1="10.0.1.2" />
-        <add name="Data" type="Ref" template="NiMorphData">Geometry morphing data index.</add>
-        <add name="Always Update" type="byte" ver1="4.0.0.2" />
-        <add name="Num Interpolators" type="uint" ver1="10.1.0.106" />
-        <add name="Interpolators" type="Ref" template="NiInterpolator" arr1="Num Interpolators" ver1="10.1.0.106" ver2="20.0.0.5" />
-        <add name="Interpolator Weights" type="MorphWeight" arr1="Num Interpolators" ver1="20.1.0.3" />
-        <add name="Num Unknown Ints" type="uint" ver1="10.2.0.0" ver2="20.0.0.5" vercond="#BSVER# #GT# 9" />
-        <add name="Unknown Ints" type="uint" arr1="Num Unknown Ints" ver1="10.2.0.0" ver2="20.0.0.5" vercond="#BSVER# #GT# 9" />
+        <field name="Morpher Flags" type="GeomMorpherFlags" ver1="10.0.1.2" />
+        <field name="Data" type="Ref" template="NiMorphData">Geometry morphing data index.</field>
+        <field name="Always Update" type="byte" ver1="4.0.0.2" />
+        <field name="Num Interpolators" type="uint" ver1="10.1.0.106" />
+        <field name="Interpolators" type="Ref" template="NiInterpolator" arr1="Num Interpolators" ver1="10.1.0.106" ver2="20.0.0.5" />
+        <field name="Interpolator Weights" type="MorphWeight" arr1="Num Interpolators" ver1="20.1.0.3" />
+        <field name="Num Unknown Ints" type="uint" ver1="10.2.0.0" ver2="20.0.0.5" vercond="#BSVER# #GT# 9" />
+        <field name="Unknown Ints" type="uint" arr1="Num Unknown Ints" ver1="10.2.0.0" ver2="20.0.0.5" vercond="#BSVER# #GT# 9" />
     </niobject>
 
     <niobject name="NiMorphController" inherit="NiInterpController" module="NiLegacy" until="V10_0_1_0">
@@ -3543,18 +3543,18 @@
 
     <niobject name="NiMorpherController" inherit="NiInterpController" module="NiAnimation">
         Unknown! Used by Daoc.
-        <add name="Data" type="Ref" template="NiMorphData">This controller's data.</add>
+        <field name="Data" type="Ref" template="NiMorphData">This controller's data.</field>
     </niobject>
 
     <niobject name="NiSingleInterpController" abstract="true" inherit="NiInterpController" module="NiAnimation">
         Uses a single NiInterpolator to animate its target value.
-        <add name="Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.104" />
+        <field name="Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.104" />
     </niobject>
 
     <niobject name="NiKeyframeController" inherit="NiSingleInterpController" module="NiAnimation">
         DEPRECATED (10.2), RENAMED (10.2) to NiTransformController
         A time controller object for animation key frames.
-        <add name="Data" type="Ref" template="NiKeyframeData" ver2="10.1.0.103" />
+        <field name="Data" type="Ref" template="NiKeyframeData" ver2="10.1.0.103" />
     </niobject>
 
     <niobject name="NiTransformController" inherit="NiKeyframeController" module="NiAnimation">
@@ -3566,15 +3566,15 @@
         NiInterpController::GetCtlrID() string format:
             '%s'
         Where %s = Value of "Modifier Name"
-        <add name="Modifier Name" type="string">Used to find the modifier pointer.</add>
+        <field name="Modifier Name" type="string">Used to find the modifier pointer.</field>
     </niobject>
 
     <niobject name="NiPSysEmitterCtlr" inherit="NiPSysModifierCtlr" module="NiParticle">
         Particle system emitter controller.
         NiInterpController::GetInterpolatorID() string format:
             ['BirthRate', 'EmitterActive'] (for "Interpolator" and "Visibility Interpolator" respectively)
-        <add name="Data" type="Ref" template="NiPSysEmitterCtlrData" ver2="10.1.0.103" />
-        <add name="Visibility Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.104" />
+        <field name="Data" type="Ref" template="NiPSysEmitterCtlrData" ver2="10.1.0.103" />
+        <field name="Visibility Interpolator" type="Ref" template="NiInterpolator" ver1="10.1.0.104" />
     </niobject>
 
     <niobject name="NiPSysModifierBoolCtlr" abstract="true" inherit="NiPSysModifierCtlr" module="NiParticle">
@@ -3583,12 +3583,12 @@
 
     <niobject name="NiPSysModifierActiveCtlr" inherit="NiPSysModifierBoolCtlr" module="NiParticle">
         A particle system modifier controller that animates active/inactive state for particles.
-        <add name="Data" type="Ref" template="NiVisData" ver2="10.1.0.103" />
+        <field name="Data" type="Ref" template="NiVisData" ver2="10.1.0.103" />
     </niobject>
 
     <niobject name="NiPSysModifierFloatCtlr" abstract="true" inherit="NiPSysModifierCtlr" module="NiParticle">
         A particle system modifier controller that animates a floating point value for particles.
-        <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
+        <field name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
     <niobject name="NiPSysEmitterDeclinationCtlr" inherit="NiPSysModifierFloatCtlr" module="NiParticle">
@@ -3623,20 +3623,20 @@
     <niobject name="NiFlipController" inherit="NiFloatInterpController" module="NiAnimation">
         Changes the image a Map (TexDesc) will use. Uses a float interpolator to animate the texture index.
         Often used for performing flipbook animation.
-        <add name="Texture Slot" type="TexType">Target texture slot (0=base, 4=glow).</add>
-        <add name="Accum Time" type="float" ver1="3.3.0.13" ver2="10.1.0.103" />
-        <add name="Delta" type="float" ver2="10.1.0.103">
+        <field name="Texture Slot" type="TexType">Target texture slot (0=base, 4=glow).</field>
+        <field name="Accum Time" type="float" ver1="3.3.0.13" ver2="10.1.0.103" />
+        <field name="Delta" type="float" ver2="10.1.0.103">
             Time between two flips.
             delta = (start_time - stop_time) / sources.num_indices
-        </add>
-        <add name="Num Sources" type="uint" />
-        <add name="Sources" type="Ref" template="NiSourceTexture" arr1="Num Sources" ver1="3.3.0.13">The texture sources.</add>
-        <add name="Images" type="Ref" template="NiImage" arr1="Num Sources" ver2="3.1">The image sources</add>
+        </field>
+        <field name="Num Sources" type="uint" />
+        <field name="Sources" type="Ref" template="NiSourceTexture" arr1="Num Sources" ver1="3.3.0.13">The texture sources.</field>
+        <field name="Images" type="Ref" template="NiImage" arr1="Num Sources" ver2="3.1">The image sources</field>
     </niobject>
 
     <niobject name="NiAlphaController" inherit="NiFloatInterpController" module="NiAnimation">
         Animates the alpha value of a property using an interpolator.
-        <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
+        <field name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
     <niobject name="NiTextureTransformController" inherit="NiFloatInterpController" module="NiAnimation">
@@ -3644,10 +3644,10 @@
         NiInterpController::GetCtlrID() string formats:
             ['%1-%2-TT_TRANSLATE_U', '%1-%2-TT_TRANSLATE_V', '%1-%2-TT_ROTATE', '%1-%2-TT_SCALE_U', '%1-%2-TT_SCALE_V']
         (Depending on "Operation" enumeration, %1 = Value of "Shader Map", %2 = Value of "Texture Slot")
-        <add name="Shader Map" type="bool">Is the target map a shader map?</add>
-        <add name="Texture Slot" type="TexType">The target texture slot.</add>
-        <add name="Operation" type="TransformMember">Controls which aspect of the texture transform to modify.</add>
-        <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
+        <field name="Shader Map" type="bool">Is the target map a shader map?</field>
+        <field name="Texture Slot" type="TexType">The target texture slot.</field>
+        <field name="Operation" type="TransformMember">Controls which aspect of the texture transform to modify.</field>
+        <field name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
     <niobject name="NiLightDimmerController" inherit="NiFloatInterpController" module="NiAnimation">
@@ -3660,7 +3660,7 @@
 
     <niobject name="NiVisController" inherit="NiBoolInterpController" module="NiAnimation">
         Animates the visibility of an NiAVObject.
-        <add name="Data" type="Ref" template="NiVisData" ver2="10.1.0.103" />
+        <field name="Data" type="Ref" template="NiVisData" ver2="10.1.0.103" />
     </niobject>
 
     <niobject name="NiPoint3InterpController" abstract="true" inherit="NiSingleInterpController" module="NiAnimation">
@@ -3672,16 +3672,16 @@
         Bits 4-5: Target Color (00 = Ambient, 01 = Diffuse, 10 = Specular, 11 = Emissive)
         NiInterpController::GetCtlrID() string formats:
             ['AMB', 'DIFF', 'SPEC', 'SELF_ILLUM'] (Depending on "Target Color")
-        <add name="Target Color" type="MaterialColor" ver1="10.1.0.0">Selects which color to control.</add>
-        <add name="Data" type="Ref" template="NiPosData" ver2="10.1.0.103" />
+        <field name="Target Color" type="MaterialColor" ver1="10.1.0.0">Selects which color to control.</field>
+        <field name="Data" type="Ref" template="NiPosData" ver2="10.1.0.103" />
     </niobject>
 
     <niobject name="NiLightColorController" inherit="NiPoint3InterpController" module="NiAnimation">
         Animates the ambient, diffuse and specular colors of an NiLight.
         NiInterpController::GetCtlrID() string formats:
             ['Diffuse', 'Ambient'] (Depending on "Target Color")
-        <add name="Target Color" type="LightColor" ver1="10.1.0.0" />
-        <add name="Data" type="Ref" template="NiPosData" ver2="10.1.0.103" />
+        <field name="Target Color" type="LightColor" ver1="10.1.0.0" />
+        <field name="Data" type="Ref" template="NiPosData" ver2="10.1.0.103" />
     </niobject>
 
 
@@ -3690,7 +3690,7 @@
         NiInterpController::GetCtlrID() string format:
             '%s'
         Where %s = Value of "Extra Data Name"
-        <add name="Extra Data Name" type="string" ver1="10.2.0.0" />
+        <field name="Extra Data Name" type="string" ver1="10.2.0.0" />
     </niobject>
 
     <niobject name="NiColorExtraDataController" inherit="NiExtraDataController" module="NiAnimation">
@@ -3700,10 +3700,10 @@
     <niobject name="NiFloatExtraDataController" inherit="NiExtraDataController" module="NiAnimation">
         Animates an NiFloatExtraData object attached to an NiAVObject.
         NiInterpController::GetCtlrID() string format is same as parent.
-        <add name="Num Extra Bytes" type="byte" ver2="10.1.0.0">Number of extra bytes.</add>
-        <add name="Unknown Bytes" type="byte" arr1="7" ver2="10.1.0.0" />
-        <add name="Unknown Extra Bytes" type="byte" arr1="Num Extra Bytes" ver2="10.1.0.0" />
-        <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
+        <field name="Num Extra Bytes" type="byte" ver2="10.1.0.0">Number of extra bytes.</field>
+        <field name="Unknown Bytes" type="byte" arr1="7" ver2="10.1.0.0" />
+        <field name="Unknown Extra Bytes" type="byte" arr1="Num Extra Bytes" ver2="10.1.0.0" />
+        <field name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
     <niobject name="NiFloatsExtraDataController" inherit="NiExtraDataController" module="NiAnimation">
@@ -3711,8 +3711,8 @@
         NiInterpController::GetCtlrID() string format:
             '%s[%d]'
         Where %s = Value of "Extra Data Name", %d = Value of "Floats Extra Data Index"
-        <add name="Floats Extra Data Index" type="int" />
-        <add name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
+        <field name="Floats Extra Data Index" type="int" />
+        <field name="Data" type="Ref" template="NiFloatData" ver2="10.1.0.103" />
     </niobject>
 
     <niobject name="NiFloatsExtraDataPoint3Controller" inherit="NiExtraDataController" module="NiAnimation">
@@ -3720,20 +3720,20 @@
         NiInterpController::GetCtlrID() string format:
             '%s[%d]'
         Where %s = Value of "Extra Data Name", %d = Value of "Floats Extra Data Index"
-        <add name="Floats Extra Data Index" type="int" />
+        <field name="Floats Extra Data Index" type="int" />
     </niobject>
 
     <niobject name="NiBoneLODController" inherit="NiTimeController" module="NiAnimation">
         DEPRECATED (20.5), Replaced by NiSkinningLODController.
         Level of detail controller for bones.  Priority is arranged from low to high.
-        <add name="LOD" type="uint" />
-        <add name="Num LODs" type="uint">Number of LODs.</add>
-        <add name="Num Node Groups" type="uint">Number of node arrays.</add>
-        <add name="Node Groups" type="NodeSet" arr1="Num LODs">A list of node sets (each set a sequence of bones).</add>
-        <add name="Num Shape Groups" type="uint" ver1="4.2.2.0" vercond="#NISTREAM#">Number of shape groups.</add>
-        <add name="Shape Groups 1" type="SkinInfoSet" arr1="Num Shape Groups" ver1="4.2.2.0" vercond="#NISTREAM#">List of shape groups.</add>
-        <add name="Num Shape Groups 2" type="uint" ver1="4.2.2.0" vercond="#NISTREAM#">The size of the second list of shape groups.</add>
-        <add name="Shape Groups 2" type="Ref" template="NiTriBasedGeom" arr1="Num Shape Groups 2" ver1="4.2.2.0" vercond="#NISTREAM#">Group of NiTriShape indices.</add>
+        <field name="LOD" type="uint" />
+        <field name="Num LODs" type="uint">Number of LODs.</field>
+        <field name="Num Node Groups" type="uint">Number of node arrays.</field>
+        <field name="Node Groups" type="NodeSet" arr1="Num LODs">A list of node sets (each set a sequence of bones).</field>
+        <field name="Num Shape Groups" type="uint" ver1="4.2.2.0" vercond="#NISTREAM#">Number of shape groups.</field>
+        <field name="Shape Groups 1" type="SkinInfoSet" arr1="Num Shape Groups" ver1="4.2.2.0" vercond="#NISTREAM#">List of shape groups.</field>
+        <field name="Num Shape Groups 2" type="uint" ver1="4.2.2.0" vercond="#NISTREAM#">The size of the second list of shape groups.</field>
+        <field name="Shape Groups 2" type="Ref" template="NiTriBasedGeom" arr1="Num Shape Groups 2" ver1="4.2.2.0" vercond="#NISTREAM#">Group of NiTriShape indices.</field>
     </niobject>
 
     <niobject name="NiBSBoneLODController" inherit="NiBoneLODController" module="BSAnimation">
@@ -3741,16 +3741,16 @@
     </niobject>
     
     <compound name="MaterialData">
-        <add name="Has Shader" type="bool" ver1="10.0.1.0" ver2="20.1.0.3">Shader.</add>
-        <add name="Shader Name" type="string" cond="Has Shader" ver1="10.0.1.0" ver2="20.1.0.3">The shader name.</add>
-        <add name="Shader Extra Data" type="int" cond="Has Shader" ver1="10.0.1.0" ver2="20.1.0.3">Extra data associated with the shader. A value of -1 means the shader is the default implementation.</add>
-        <add name="Num Materials" type="uint" ver1="20.2.0.5" />
-        <add name="Material Name" type="NiFixedString" arr1="Num Materials" ver1="20.2.0.5">The name of the material.</add>
-        <add name="Material Extra Data" type="int" arr1="Num Materials" ver1="20.2.0.5">Extra data associated with the material. A value of -1 means the material is the default implementation.</add>
-        <add name="Active Material" type="int" default="-1" ver1="20.2.0.5">The index of the currently active material.</add>
-        <add name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" vercond="#USER# == 1">Cyanide extension (Blood Bowl).</add>
-        <add name="WorldShift Unknown" type="int" ver1="10.3.0.1" ver2="10.4.0.1" />
-        <add name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</add>
+        <field name="Has Shader" type="bool" ver1="10.0.1.0" ver2="20.1.0.3">Shader.</field>
+        <field name="Shader Name" type="string" cond="Has Shader" ver1="10.0.1.0" ver2="20.1.0.3">The shader name.</field>
+        <field name="Shader Extra Data" type="int" cond="Has Shader" ver1="10.0.1.0" ver2="20.1.0.3">Extra data associated with the shader. A value of -1 means the shader is the default implementation.</field>
+        <field name="Num Materials" type="uint" ver1="20.2.0.5" />
+        <field name="Material Name" type="NiFixedString" arr1="Num Materials" ver1="20.2.0.5">The name of the material.</field>
+        <field name="Material Extra Data" type="int" arr1="Num Materials" ver1="20.2.0.5">Extra data associated with the material. A value of -1 means the material is the default implementation.</field>
+        <field name="Active Material" type="int" default="-1" ver1="20.2.0.5">The index of the currently active material.</field>
+        <field name="Cyanide Unknown" type="byte" default="255" ver1="10.2.0.0" ver2="10.2.0.0" vercond="#USER# == 1">Cyanide extension (Blood Bowl).</field>
+        <field name="WorldShift Unknown" type="int" ver1="10.3.0.1" ver2="10.4.0.1" />
+        <field name="Material Needs Update" type="bool" ver1="20.2.0.7">Whether the materials for this object always needs to be updated before rendering with them.</field>
     </compound>
 
     <niobject name="NiGeometry" abstract="true" inherit="NiAVObject" module="NiMain">
@@ -3759,17 +3759,17 @@
             Most new blocks (e.g. BSTriShape) do not refer to NiGeometry except NiParticleSystem was changed to use BSGeometry.
             This causes massive inheritance problems so the rows below are doubled up to exclude NiParticleSystem for Bethesda Stream 100+
             and to add data exclusive to BSGeometry.
-        <add name="Bounding Sphere" type="NiBound" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
-        <add name="Bound Min Max" type="float" arr1="6" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_F76#" onlyT="NiParticleSystem" />
-        <add name="Skin" type="Ref" template="NiObject" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
-        <add name="Data" type="Ref" template="NiGeometryData" vercond="#NI_BS_LT_SSE#">Data index (NiTriShapeData/NiTriStripData).</add>
-        <add name="Data" type="Ref" template="NiGeometryData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</add>
-        <add name="Skin Instance" type="Ref" template="NiSkinInstance" ver1="3.3.0.13" vercond="#NI_BS_LT_SSE#" />
-        <add name="Skin Instance" type="Ref" template="NiSkinInstance" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
-        <add name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#NI_BS_LT_SSE#" />
-        <add name="Material Data" type="MaterialData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
-        <add name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
-        <add name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <field name="Bounding Sphere" type="NiBound" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
+        <field name="Bound Min Max" type="float" arr1="6" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_F76#" onlyT="NiParticleSystem" />
+        <field name="Skin" type="Ref" template="NiObject" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" onlyT="NiParticleSystem" />
+        <field name="Data" type="Ref" template="NiGeometryData" vercond="#NI_BS_LT_SSE#">Data index (NiTriShapeData/NiTriStripData).</field>
+        <field name="Data" type="Ref" template="NiGeometryData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem">Data index (NiTriShapeData/NiTriStripData).</field>
+        <field name="Skin Instance" type="Ref" template="NiSkinInstance" ver1="3.3.0.13" vercond="#NI_BS_LT_SSE#" />
+        <field name="Skin Instance" type="Ref" template="NiSkinInstance" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
+        <field name="Material Data" type="MaterialData" ver1="10.0.1.0" vercond="#NI_BS_LT_SSE#" />
+        <field name="Material Data" type="MaterialData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_SSE#" excludeT="NiParticleSystem" />
+        <field name="Shader Property" type="Ref" template="BSShaderProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <field name="Alpha Property" type="Ref" template="NiAlphaProperty" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
     </niobject>
 
     <niobject name="NiTriBasedGeom" abstract="true" inherit="NiGeometry" module="NiMain">
@@ -3782,41 +3782,41 @@
             "Num Vertices" is renamed to "BS Max Vertices" for Bethesda 20.2 because Vertices, Normals, Tangents, Colors, and UV arrays
             do not have length for NiPSysData regardless of "Num" or booleans.
 
-        <add name="Group ID" type="int" ver1="10.1.0.114">Always zero.</add>
-        <add name="Num Vertices" type="ushort" excludeT="NiPSysData">Number of vertices.</add>
-        <add name="Num Vertices" type="ushort" onlyT="NiPSysData" vercond="#NI_BS_LT_FO3#">Number of vertices.</add>
-        <add name="BS Max Vertices" type="ushort" onlyT="NiPSysData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_FO3#">Bethesda uses this for max number of particles in NiPSysData.</add>
-        <add name="Keep Flags" type="byte" ver1="10.1.0.0">Used with NiCollision objects when OBB or TRI is set.</add>
-        <add name="Compress Flags" type="byte" ver1="10.1.0.0" />
-        <add name="Has Vertices" type="bool" default="1">Is the vertex array present? (Always non-zero.)</add>
-        <add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Has Vertices">The mesh vertices.</add>
-        <add name="Data Flags" type="NiGeometryDataFlags" ver1="10.0.1.0" vercond="!#BS202#" />
-        <add name="BS Data Flags" type="BSGeometryDataFlags" vercond="#BS202#" />
-        <add name="Material CRC" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
-        <add name="Has Normals" type="bool">Do we have lighting normals? These are essential for proper lighting: if not present, the model will only be influenced by ambient light.</add>
-        <add name="Normals" type="Vector3" arr1="Num Vertices" cond="Has Normals">The lighting normals.</add>
-        <add name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) #AND# ((Data Flags | BS Data Flags) #BITAND# 4096)" ver1="10.1.0.0">Tangent vectors.</add>
-        <add name="Bitangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) #AND# ((Data Flags | BS Data Flags) #BITAND# 4096)" ver1="10.1.0.0">Bitangent vectors.</add>
-        <add name="Has DIV2 Floats" type="bool" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
-        <add name="DIV2 Floats" type="float" arr1="Num Vertices" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" cond="Has DIV2 Floats" />
-        <add name="Bounding Sphere" type="NiBound" />
-        <add name="Has Vertex Colors" type="bool">
+        <field name="Group ID" type="int" ver1="10.1.0.114">Always zero.</field>
+        <field name="Num Vertices" type="ushort" excludeT="NiPSysData">Number of vertices.</field>
+        <field name="Num Vertices" type="ushort" onlyT="NiPSysData" vercond="#NI_BS_LT_FO3#">Number of vertices.</field>
+        <field name="BS Max Vertices" type="ushort" onlyT="NiPSysData" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_FO3#">Bethesda uses this for max number of particles in NiPSysData.</field>
+        <field name="Keep Flags" type="byte" ver1="10.1.0.0">Used with NiCollision objects when OBB or TRI is set.</field>
+        <field name="Compress Flags" type="byte" ver1="10.1.0.0" />
+        <field name="Has Vertices" type="bool" default="1">Is the vertex array present? (Always non-zero.)</field>
+        <field name="Vertices" type="Vector3" arr1="Num Vertices" cond="Has Vertices">The mesh vertices.</field>
+        <field name="Data Flags" type="NiGeometryDataFlags" ver1="10.0.1.0" vercond="!#BS202#" />
+        <field name="BS Data Flags" type="BSGeometryDataFlags" vercond="#BS202#" />
+        <field name="Material CRC" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <field name="Has Normals" type="bool">Do we have lighting normals? These are essential for proper lighting: if not present, the model will only be influenced by ambient light.</field>
+        <field name="Normals" type="Vector3" arr1="Num Vertices" cond="Has Normals">The lighting normals.</field>
+        <field name="Tangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) #AND# ((Data Flags | BS Data Flags) #BITAND# 4096)" ver1="10.1.0.0">Tangent vectors.</field>
+        <field name="Bitangents" type="Vector3" arr1="Num Vertices" cond="(Has Normals) #AND# ((Data Flags | BS Data Flags) #BITAND# 4096)" ver1="10.1.0.0">Bitangent vectors.</field>
+        <field name="Has DIV2 Floats" type="bool" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
+        <field name="DIV2 Floats" type="float" arr1="Num Vertices" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" cond="Has DIV2 Floats" />
+        <field name="Bounding Sphere" type="NiBound" />
+        <field name="Has Vertex Colors" type="bool">
             Do we have vertex colors? These are usually used to fine-tune the lighting of the model.
 
             Note: how vertex colors influence the model can be controlled by having a NiVertexColorProperty object as a property child of the root node. If this property object is not present, the vertex colors fine-tune lighting.
 
             Note 2: set to either 0 or 0xFFFFFFFF for NifTexture compatibility.
-        </add>
-        <add name="Vertex Colors" type="Color4" default="#VEC4_ONE#" arr1="Num Vertices" cond="Has Vertex Colors">The vertex colors.</add>
-        <add name="Data Flags" type="NiGeometryDataFlags" ver2="4.2.2.0">The lower 6 bits of this field represent the number of UV texture sets. The rest is unused.</add>
-        <add name="Has UV" type="bool" ver2="4.0.0.2">
+        </field>
+        <field name="Vertex Colors" type="Color4" default="#VEC4_ONE#" arr1="Num Vertices" cond="Has Vertex Colors">The vertex colors.</field>
+        <field name="Data Flags" type="NiGeometryDataFlags" ver2="4.2.2.0">The lower 6 bits of this field represent the number of UV texture sets. The rest is unused.</field>
+        <field name="Has UV" type="bool" ver2="4.0.0.2">
             Do we have UV coordinates?
 
             Note: for compatibility with NifTexture, set this value to either 0x00000000 or 0xFFFFFFFF.
-        </add>
-        <add name="UV Sets" type="TexCoord" arr1="((Data Flags #BITAND# 63) | (BS Data Flags #BITAND# 1))" arr2="Num Vertices">The UV texture coordinates. They follow the OpenGL standard: some programs may require you to flip the second coordinate.</add>
-        <add name="Consistency Flags" type="ConsistencyType" ver1="10.0.1.0" default="CT_MUTABLE">Consistency Flags</add>
-        <add name="Additional Data" type="Ref" template="AbstractAdditionalGeometryData" ver1="20.0.0.4" />
+        </field>
+        <field name="UV Sets" type="TexCoord" arr1="((Data Flags #BITAND# 63) | (BS Data Flags #BITAND# 1))" arr2="Num Vertices">The UV texture coordinates. They follow the OpenGL standard: some programs may require you to flip the second coordinate.</field>
+        <field name="Consistency Flags" type="ConsistencyType" ver1="10.0.1.0" default="CT_MUTABLE">Consistency Flags</field>
+        <field name="Additional Data" type="Ref" template="AbstractAdditionalGeometryData" ver1="20.0.0.4" />
     </niobject>
 
     <niobject name="AbstractAdditionalGeometryData" abstract="true" inherit="NiObject" module="NiMain">
@@ -3824,29 +3824,29 @@
 
     <niobject name="NiTriBasedGeomData" abstract="true" inherit="NiGeometryData" module="NiMain">
         Describes a mesh, built from triangles.
-        <add name="Num Triangles" type="ushort">Number of triangles.</add>
+        <field name="Num Triangles" type="ushort">Number of triangles.</field>
     </niobject>
 
     <niobject name="bhkBlendController" inherit="NiTimeController" module="BSHavok">
         Unknown. Is apparently only used in skeleton.nif files.
-        <add name="Keys" type="uint">Seems to be always zero.</add>
+        <field name="Keys" type="uint">Seems to be always zero.</field>
     </niobject>
 
     <niobject name="BSBound" inherit="NiExtraData" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific collision bounding box for skeletons.
-        <add name="Center" type="Vector3">Center of the bounding box.</add>
-        <add name="Dimensions" type="Vector3">Dimensions of the bounding box from center.</add>
+        <field name="Center" type="Vector3">Center of the bounding box.</field>
+        <field name="Dimensions" type="Vector3">Dimensions of the bounding box from center.</field>
     </niobject>
 
     <niobject name="BSFurnitureMarker" inherit="NiExtraData" module="BSMain" versions="#BETHESDA#">
         Unknown. Marks furniture sitting positions?
-        <add name="Num Positions" type="uint" />
-        <add name="Positions" type="FurniturePosition" arr1="Num Positions" />
+        <field name="Num Positions" type="uint" />
+        <field name="Positions" type="FurniturePosition" arr1="Num Positions" />
     </niobject>
 
     <niobject name="BSParentVelocityModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
         Particle modifier that adds a percentage of object space translation and rotation to particles born in world space.
-        <add name="Damping" type="float">Amount of blending?</add>
+        <field name="Damping" type="float">Amount of blending?</field>
     </niobject>
 
     <niobject name="BSPSysArrayEmitter" inherit="NiPSysVolumeEmitter" module="BSParticle" versions="#BETHESDA#">
@@ -3855,29 +3855,29 @@
 
     <niobject name="BSWindModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
         Particle Modifier that uses the wind value from the gamedata to alter the path of particles.
-        <add name="Strength" type="float" default="0.25">The amount of force wind will have on particles.</add>
+        <field name="Strength" type="float" default="0.25">The amount of force wind will have on particles.</field>
     </niobject>
 
     <niobject name="hkPackedNiTriStripsData" inherit="bhkShapeCollection" module="BSHavok" versions="#BETHESDA#">
         Bethesda custom tri strips data block for bhkPackedNiTriStripsShape.
-        <add name="Num Triangles" type="uint" />
-        <add name="Triangles" type="TriangleData" arr1="Num Triangles" />
-        <add name="Num Vertices" type="uint" />
-        <add name="Compressed" type="bool" ver1="20.2.0.7" />
-        <add name="Vertices" type="Vector3" arr1="Num Vertices" cond="Compressed == 0" />
-        <add name="Compressed Vertices" type="HalfVector3" arr1="Num Vertices" cond="Compressed != 0">
+        <field name="Num Triangles" type="uint" />
+        <field name="Triangles" type="TriangleData" arr1="Num Triangles" />
+        <field name="Num Vertices" type="uint" />
+        <field name="Compressed" type="bool" ver1="20.2.0.7" />
+        <field name="Vertices" type="Vector3" arr1="Num Vertices" cond="Compressed == 0" />
+        <field name="Compressed Vertices" type="HalfVector3" arr1="Num Vertices" cond="Compressed != 0">
             Compression on read may not be supported. Vertices may be packed in ushort that are not IEEE standard half-precision.
-        </add>
-        <add name="Num Sub Shapes" type="ushort" ver1="20.2.0.7" />
-        <add name="Sub Shapes" type="hkSubPartData" arr1="Num Sub Shapes" ver1="20.2.0.7" />
+        </field>
+        <field name="Num Sub Shapes" type="ushort" ver1="20.2.0.7" />
+        <field name="Sub Shapes" type="hkSubPartData" arr1="Num Sub Shapes" ver1="20.2.0.7" />
     </niobject>
 
     <niobject name="NiAlphaProperty" inherit="NiProperty" module="NiMain">
         Transparency. Flags 0x00ED.
-        <add name="Flags" type="AlphaFlags" default="4844" />
-        <add name="Threshold" type="byte" default="128">Threshold for alpha testing</add>
-        <add name="Unknown Short 1" type="ushort" ver2="2.3" />
-        <add name="Unknown Int 2" type="uint" ver2="2.3" />
+        <field name="Flags" type="AlphaFlags" default="4844" />
+        <field name="Threshold" type="byte" default="128">Threshold for alpha testing</field>
+        <field name="Unknown Short 1" type="ushort" ver2="2.3" />
+        <field name="Unknown Int 2" type="uint" ver2="2.3" />
     </niobject>
 
     <niobject name="NiAmbientLight" inherit="NiLight" module="NiMain">
@@ -3893,35 +3893,35 @@
     <niobject name="NiParticlesData" inherit="NiGeometryData" module="NiMain">
         Generic rotating particles data object.
         Bethesda 20.2.0.7 NIFs: NiParticlesData no longer inherits from NiGeometryData and inherits NiObject directly.
-        <add name="Num Particles" type="ushort" ver2="4.0.0.2">The maximum number of particles (matches the number of vertices).</add>
-        <add name="Particle Radius" type="float" ver2="10.0.1.0">The particles' size.</add>
-        <add name="Has Radii" type="bool" ver1="10.1.0.0">Is the particle size array present?</add>
-        <add name="Radii" type="float" arr1="Num Vertices" cond="Has Radii" ver1="10.1.0.0" vercond="!#BS202#">The individual particle sizes.</add>
-        <add name="Num Active" type="ushort">The number of active particles at the time the system was saved. This is also the number of valid entries in the following arrays.</add>
-        <add name="Has Sizes" type="bool">Is the particle size array present?</add>
-        <add name="Sizes" type="float" arr1="Num Vertices" cond="Has Sizes" vercond="!#BS202#">The individual particle sizes.</add>
-        <add name="Has Rotations" type="bool" ver1="10.0.1.0">Is the particle rotation array present?</add>
-        <add name="Rotations" type="Quaternion" arr1="Num Vertices" cond="Has Rotations" ver1="10.0.1.0" vercond="!#BS202#">The individual particle rotations.</add>
-        <add name="Has Rotation Angles" type="bool" ver1="20.0.0.4">Are the angles of rotation present?</add>
-        <add name="Rotation Angles" type="float" arr1="Num Vertices" cond="Has Rotation Angles" vercond="!#BS202#">Angles of rotation</add>
-        <add name="Has Rotation Axes" type="bool" ver1="20.0.0.4">Are axes of rotation present?</add>
-        <add name="Rotation Axes" type="Vector3" arr1="Num Vertices" cond="Has Rotation Axes" ver1="20.0.0.4" vercond="!#BS202#">Axes of rotation.</add>
-
-        <add name="Has Texture Indices" type="bool" vercond="#BS202#" />
-        <add name="Num Subtexture Offsets" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#">How many quads to use in BSPSysSubTexModifier for texture atlasing</add>
-        <add name="Num Subtexture Offsets" type="byte" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BSSTREAM# #AND# #NI_BS_LTE_FO3#">2,4,8,16,32,64 are potential values. If "Has" was no then this should be 256, which represents a 16x16 framed image, which is invalid</add>
-        <add name="Subtexture Offsets" type="Vector4" arr1="Num Subtexture Offsets" vercond="#BS202#">Defines UV offsets</add>
-        <add name="Aspect Ratio" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#">Sets aspect ratio for Subtexture Offset UV quads</add>
-        <add name="Aspect Flags" type="AspectFlags" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
-        <add name="Speed to Aspect Aspect 2" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
-        <add name="Speed to Aspect Speed 1" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
-        <add name="Speed to Aspect Speed 2" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <field name="Num Particles" type="ushort" ver2="4.0.0.2">The maximum number of particles (matches the number of vertices).</field>
+        <field name="Particle Radius" type="float" ver2="10.0.1.0">The particles' size.</field>
+        <field name="Has Radii" type="bool" ver1="10.1.0.0">Is the particle size array present?</field>
+        <field name="Radii" type="float" arr1="Num Vertices" cond="Has Radii" ver1="10.1.0.0" vercond="!#BS202#">The individual particle sizes.</field>
+        <field name="Num Active" type="ushort">The number of active particles at the time the system was saved. This is also the number of valid entries in the following arrays.</field>
+        <field name="Has Sizes" type="bool">Is the particle size array present?</field>
+        <field name="Sizes" type="float" arr1="Num Vertices" cond="Has Sizes" vercond="!#BS202#">The individual particle sizes.</field>
+        <field name="Has Rotations" type="bool" ver1="10.0.1.0">Is the particle rotation array present?</field>
+        <field name="Rotations" type="Quaternion" arr1="Num Vertices" cond="Has Rotations" ver1="10.0.1.0" vercond="!#BS202#">The individual particle rotations.</field>
+        <field name="Has Rotation Angles" type="bool" ver1="20.0.0.4">Are the angles of rotation present?</field>
+        <field name="Rotation Angles" type="float" arr1="Num Vertices" cond="Has Rotation Angles" vercond="!#BS202#">Angles of rotation</field>
+        <field name="Has Rotation Axes" type="bool" ver1="20.0.0.4">Are axes of rotation present?</field>
+        <field name="Rotation Axes" type="Vector3" arr1="Num Vertices" cond="Has Rotation Axes" ver1="20.0.0.4" vercond="!#BS202#">Axes of rotation.</field>
+
+        <field name="Has Texture Indices" type="bool" vercond="#BS202#" />
+        <field name="Num Subtexture Offsets" type="uint" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#">How many quads to use in BSPSysSubTexModifier for texture atlasing</field>
+        <field name="Num Subtexture Offsets" type="byte" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BSSTREAM# #AND# #NI_BS_LTE_FO3#">2,4,8,16,32,64 are potential values. If "Has" was no then this should be 256, which represents a 16x16 framed image, which is invalid</field>
+        <field name="Subtexture Offsets" type="Vector4" arr1="Num Subtexture Offsets" vercond="#BS202#">Defines UV offsets</field>
+        <field name="Aspect Ratio" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#">Sets aspect ratio for Subtexture Offset UV quads</field>
+        <field name="Aspect Flags" type="AspectFlags" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <field name="Speed to Aspect Aspect 2" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <field name="Speed to Aspect Speed 1" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
+        <field name="Speed to Aspect Speed 2" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GT_FO3#" />
     </niobject>
 
     <niobject name="NiRotatingParticlesData" inherit="NiParticlesData" module="NiLegacy" until="V10_0_1_0">
         Rotating particles data object.
-        <add name="Has Rotations 2" type="bool" ver2="4.2.2.0">Is the particle rotation array present?</add>
-        <add name="Rotations 2" type="Quaternion" arr1="Num Vertices" cond="Has Rotations 2" ver2="4.2.2.0">The individual particle rotations.</add>
+        <field name="Has Rotations 2" type="bool" ver2="4.2.2.0">Is the particle rotation array present?</field>
+        <field name="Rotations 2" type="Quaternion" arr1="Num Vertices" cond="Has Rotations 2" ver2="4.2.2.0">The individual particle rotations.</field>
     </niobject>
 
     <niobject name="NiAutoNormalParticlesData" inherit="NiParticlesData" module="NiLegacy" until="V10_0_1_0">
@@ -3930,123 +3930,123 @@
 
     <niobject name="NiPSysData" inherit="NiParticlesData" module="NiParticle">
         Particle system data.
-        <add name="Particle Info" type="NiParticleInfo" arr1="Num Vertices" vercond="!#BS202#" />
-        <add name="Unknown Vector" type="Vector3" vercond="#BS_F76#" />
-        <add name="Has Rotation Speeds" type="bool" ver1="20.0.0.2" />
-        <add name="Rotation Speeds" type="float" arr1="Num Vertices" cond="Has Rotation Speeds" ver1="20.0.0.2" vercond="!#BS202#" />
-        <add name="Num Added Particles" type="ushort" vercond="!#BS202#" />
-        <add name="Added Particles Base" type="ushort" vercond="!#BS202#" />
+        <field name="Particle Info" type="NiParticleInfo" arr1="Num Vertices" vercond="!#BS202#" />
+        <field name="Unknown Vector" type="Vector3" vercond="#BS_F76#" />
+        <field name="Has Rotation Speeds" type="bool" ver1="20.0.0.2" />
+        <field name="Rotation Speeds" type="float" arr1="Num Vertices" cond="Has Rotation Speeds" ver1="20.0.0.2" vercond="!#BS202#" />
+        <field name="Num Added Particles" type="ushort" vercond="!#BS202#" />
+        <field name="Added Particles Base" type="ushort" vercond="!#BS202#" />
     </niobject>
     
     <niobject name="NiMeshPSysData" inherit="NiPSysData" module="NiParticle">
         Particle meshes data.
-        <add name="Default Pool Size" type="uint" ver1="10.2.0.0" />
-        <add name="Fill Pools On Load" type="bool" ver1="10.2.0.0" />
-        <add name="Num Generations" type="uint" ver1="10.2.0.0" />
-        <add name="Generations" type="uint" ver1="10.2.0.0" arr1="Num Generations" />
-        <add name="Particle Meshes" type="Ref" template="NiNode" />
+        <field name="Default Pool Size" type="uint" ver1="10.2.0.0" />
+        <field name="Fill Pools On Load" type="bool" ver1="10.2.0.0" />
+        <field name="Num Generations" type="uint" ver1="10.2.0.0" />
+        <field name="Generations" type="uint" ver1="10.2.0.0" arr1="Num Generations" />
+        <field name="Particle Meshes" type="Ref" template="NiNode" />
     </niobject>
 
     <niobject name="NiBinaryExtraData" inherit="NiExtraData" module="NiMain">
         Binary extra data object. Used to store tangents and bitangents in Oblivion.
-        <add name="Binary Data" type="ByteArray">The binary data.</add>
+        <field name="Binary Data" type="ByteArray">The binary data.</field>
     </niobject>
 
     <niobject name="NiBinaryVoxelExtraData" inherit="NiExtraData" module="NiLegacy" until="V3_1">
         Voxel extra data object.
-        <add name="Data" type="Ref" template="NiBinaryVoxelData" />
+        <field name="Data" type="Ref" template="NiBinaryVoxelData" />
     </niobject>
 
     <niobject name="NiBinaryVoxelData" inherit="NiObject" module="NiLegacy" until="V3_1">
         Voxel data object.
-        <add name="Unknown Short 1" type="ushort" />
-        <add name="Unknown Short 2" type="ushort" />
-        <add name="Unknown Short 3" type="ushort" />
-        <add name="Unknown 7 Floats" type="float" arr1="7" />
-        <add name="Unknown Bytes 1" type="byte" arr1="7" arr2="12" />
-        <add name="Num Unknown Vectors" type="uint" />
-        <add name="Unknown Vectors" type="Vector4" arr1="Num Unknown Vectors" />
-        <add name="Num Unknown Bytes 2" type="uint" />
-        <add name="Unknown Bytes 2" type="byte" arr1="Num Unknown Bytes 2" />
-        <add name="Unknown 5 Ints" type="uint" arr1="5" />
+        <field name="Unknown Short 1" type="ushort" />
+        <field name="Unknown Short 2" type="ushort" />
+        <field name="Unknown Short 3" type="ushort" />
+        <field name="Unknown 7 Floats" type="float" arr1="7" />
+        <field name="Unknown Bytes 1" type="byte" arr1="7" arr2="12" />
+        <field name="Num Unknown Vectors" type="uint" />
+        <field name="Unknown Vectors" type="Vector4" arr1="Num Unknown Vectors" />
+        <field name="Num Unknown Bytes 2" type="uint" />
+        <field name="Unknown Bytes 2" type="byte" arr1="Num Unknown Bytes 2" />
+        <field name="Unknown 5 Ints" type="uint" arr1="5" />
     </niobject>
 
     <niobject name="NiBlendBoolInterpolator" inherit="NiBlendInterpolator" module="NiAnimation">
         Blends bool values together.
-        <add name="Value" type="byte" default="2">The pose value. Invalid if using data.</add>
+        <field name="Value" type="byte" default="2">The pose value. Invalid if using data.</field>
     </niobject>
 
     <niobject name="NiBlendFloatInterpolator" inherit="NiBlendInterpolator" module="NiAnimation">
         Blends float values together.
-        <add name="Value" type="float" default="#INV_FLT#">The pose value. Invalid if using data.</add>
+        <field name="Value" type="float" default="#INV_FLT#">The pose value. Invalid if using data.</field>
     </niobject>
 
     <niobject name="NiBlendPoint3Interpolator" inherit="NiBlendInterpolator" module="NiAnimation">
         Blends NiPoint3 values together.
-        <add name="Value" type="Vector3" default="#INV_VEC3#">The pose value. Invalid if using data.</add>
+        <field name="Value" type="Vector3" default="#INV_VEC3#">The pose value. Invalid if using data.</field>
     </niobject>
 
     <niobject name="NiBlendTransformInterpolator" inherit="NiBlendInterpolator" module="NiAnimation">
         Blends NiQuatTransform values together.
-        <add name="Value" type="NiQuatTransform" ver2="10.1.0.109" />
+        <field name="Value" type="NiQuatTransform" ver2="10.1.0.109" />
     </niobject>
 
     <niobject name="NiBoolData" inherit="NiObject" module="NiAnimation">
         Wrapper for boolean animation keys.
-        <add name="Data" type="KeyGroup" template="byte">The boolean keys.</add>
+        <field name="Data" type="KeyGroup" template="byte">The boolean keys.</field>
     </niobject>
 
     <niobject name="NiBooleanExtraData" inherit="NiExtraData" module="NiMain">
         Boolean extra data.
-        <add name="Boolean Data" type="byte">The boolean extra data value.</add>
+        <field name="Boolean Data" type="byte">The boolean extra data value.</field>
     </niobject>
 
     <niobject name="NiBSplineBasisData" inherit="NiObject" module="NiAnimation">
         Contains an NiBSplineBasis for use in interpolation of open, uniform B-Splines.
-        <add name="Num Control Points" type="uint">The number of control points of the B-spline (number of frames of animation plus degree of B-spline minus one).</add>
+        <field name="Num Control Points" type="uint">The number of control points of the B-spline (number of frames of animation plus degree of B-spline minus one).</field>
     </niobject>
 
     <niobject name="NiBSplineFloatInterpolator" abstract="true" inherit="NiBSplineInterpolator" module="NiAnimation">
         Uses B-Splines to animate a float value over time.
-        <add name="Value" type="float" default="#INV_FLT#">Base value when curve not defined.</add>
-        <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
+        <field name="Value" type="float" default="#INV_FLT#">Base value when curve not defined.</field>
+        <field name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</field>
     </niobject>
 
     <niobject name="NiBSplineCompFloatInterpolator" inherit="NiBSplineFloatInterpolator" module="NiAnimation">
         NiBSplineFloatInterpolator plus the information required for using compact control points.
-        <add name="Float Offset" type="float" default="#FLT_MAX#" />
-        <add name="Float Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Float Offset" type="float" default="#FLT_MAX#" />
+        <field name="Float Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiBSplinePoint3Interpolator" abstract="true" inherit="NiBSplineInterpolator" module="NiAnimation">
         Uses B-Splines to animate an NiPoint3 value over time.
-        <add name="Value" type="Vector3" default="#INV_VEC3#">Base value when curve not defined.</add>
-        <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
+        <field name="Value" type="Vector3" default="#INV_VEC3#">Base value when curve not defined.</field>
+        <field name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</field>
     </niobject>
 
     <niobject name="NiBSplineCompPoint3Interpolator" inherit="NiBSplinePoint3Interpolator" module="NiAnimation">
         NiBSplinePoint3Interpolator plus the information required for using compact control points.
-        <add name="Position Offset" type="float" default="#FLT_MAX#" />
-        <add name="Position Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Position Offset" type="float" default="#FLT_MAX#" />
+        <field name="Position Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiBSplineTransformInterpolator" inherit="NiBSplineInterpolator" module="NiAnimation">
         Supports the animation of position, rotation, and scale using an NiQuatTransform.
         The NiQuatTransform can be an unchanging pose or interpolated from B-Spline control point channels.
-        <add name="Transform" type="NiQuatTransform" />
-        <add name="Translation Handle" type="uint" default="0xFFFF">Handle into the translation data. (USHRT_MAX for invalid handle.)</add>
-        <add name="Rotation Handle" type="uint" default="0xFFFF">Handle into the rotation data. (USHRT_MAX for invalid handle.)</add>
-        <add name="Scale Handle" type="uint" default="0xFFFF">Handle into the scale data. (USHRT_MAX for invalid handle.)</add>
+        <field name="Transform" type="NiQuatTransform" />
+        <field name="Translation Handle" type="uint" default="0xFFFF">Handle into the translation data. (USHRT_MAX for invalid handle.)</field>
+        <field name="Rotation Handle" type="uint" default="0xFFFF">Handle into the rotation data. (USHRT_MAX for invalid handle.)</field>
+        <field name="Scale Handle" type="uint" default="0xFFFF">Handle into the scale data. (USHRT_MAX for invalid handle.)</field>
     </niobject>
 
     <niobject name="NiBSplineCompTransformInterpolator" inherit="NiBSplineTransformInterpolator" module="NiAnimation">
         NiBSplineTransformInterpolator plus the information required for using compact control points.
-        <add name="Translation Offset" type="float" default="#FLT_MAX#" />
-        <add name="Translation Half Range" type="float" default="#FLT_MAX#" />
-        <add name="Rotation Offset" type="float" default="#FLT_MAX#" />
-        <add name="Rotation Half Range" type="float" default="#FLT_MAX#" />
-        <add name="Scale Offset" type="float" default="#FLT_MAX#" />
-        <add name="Scale Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Translation Offset" type="float" default="#FLT_MAX#" />
+        <field name="Translation Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Rotation Offset" type="float" default="#FLT_MAX#" />
+        <field name="Rotation Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Scale Offset" type="float" default="#FLT_MAX#" />
+        <field name="Scale Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 	
 	<niobject name="BSRotAccumTransfInterpolator" inherit="NiTransformInterpolator" module="BSAnimation" versions="#BETHESDA#">
@@ -4054,82 +4054,82 @@
 
     <niobject name="NiBSplineData" inherit="NiObject" module="NiAnimation">
         Contains one or more sets of control points for use in interpolation of open, uniform B-Splines, stored as either float or compact.
-        <add name="Num Float Control Points" type="uint" />
-        <add name="Float Control Points" type="float" arr1="Num Float Control Points">Float values representing the control data.</add>
-        <add name="Num Compact Control Points" type="uint" />
-        <add name="Compact Control Points" type="short" arr1="Num Compact Control Points">Signed shorts representing the data from 0 to 1 (scaled by SHRT_MAX).</add>
+        <field name="Num Float Control Points" type="uint" />
+        <field name="Float Control Points" type="float" arr1="Num Float Control Points">Float values representing the control data.</field>
+        <field name="Num Compact Control Points" type="uint" />
+        <field name="Compact Control Points" type="short" arr1="Num Compact Control Points">Signed shorts representing the data from 0 to 1 (scaled by SHRT_MAX).</field>
     </niobject>
 
     <niobject name="NiCamera" inherit="NiAVObject" module="NiMain">
         Camera object.
-        <add name="Camera Flags" type="ushort" ver1="10.1.0.0">Obsolete flags.</add>
-        <add name="Frustum Left" type="float" default="-0.63707">Frustrum left.</add>
-        <add name="Frustum Right" type="float" default="0.63707">Frustrum right.</add>
-        <add name="Frustum Top" type="float" default="0.385714">Frustrum top.</add>
-        <add name="Frustum Bottom" type="float" default="-0.385714">Frustrum bottom.</add>
-        <add name="Frustum Near" type="float" default="1.0">Frustrum near.</add>
-        <add name="Frustum Far" type="float" default="5000.0">Frustrum far.</add>
-        <add name="Use Orthographic Projection" type="bool" ver1="10.1.0.0">Determines whether perspective is used.  Orthographic means no perspective.</add>
-        <add name="Viewport Left" type="float">Viewport left.</add>
-        <add name="Viewport Right" type="float" default="1.0">Viewport right.</add>
-        <add name="Viewport Top" type="float" default="1.0">Viewport top.</add>
-        <add name="Viewport Bottom" type="float">Viewport bottom.</add>
-        <add name="LOD Adjust" type="float" default="1.0">Level of detail adjust.</add>
-        <add name="Scene" type="Ref" template="NiAVObject" />
-        <add name="Num Screen Polygons" type="uint" calc="0">Deprecated. Array is always zero length on disk write.</add>
-        <add name="Num Screen Textures" type="uint" calc="0" ver1="4.2.1.0">Deprecated. Array is always zero length on disk write.</add>
-        <add name="Unknown Int 3" type="uint" ver2="3.1" />
+        <field name="Camera Flags" type="ushort" ver1="10.1.0.0">Obsolete flags.</field>
+        <field name="Frustum Left" type="float" default="-0.63707">Frustrum left.</field>
+        <field name="Frustum Right" type="float" default="0.63707">Frustrum right.</field>
+        <field name="Frustum Top" type="float" default="0.385714">Frustrum top.</field>
+        <field name="Frustum Bottom" type="float" default="-0.385714">Frustrum bottom.</field>
+        <field name="Frustum Near" type="float" default="1.0">Frustrum near.</field>
+        <field name="Frustum Far" type="float" default="5000.0">Frustrum far.</field>
+        <field name="Use Orthographic Projection" type="bool" ver1="10.1.0.0">Determines whether perspective is used.  Orthographic means no perspective.</field>
+        <field name="Viewport Left" type="float">Viewport left.</field>
+        <field name="Viewport Right" type="float" default="1.0">Viewport right.</field>
+        <field name="Viewport Top" type="float" default="1.0">Viewport top.</field>
+        <field name="Viewport Bottom" type="float">Viewport bottom.</field>
+        <field name="LOD Adjust" type="float" default="1.0">Level of detail adjust.</field>
+        <field name="Scene" type="Ref" template="NiAVObject" />
+        <field name="Num Screen Polygons" type="uint" calc="0">Deprecated. Array is always zero length on disk write.</field>
+        <field name="Num Screen Textures" type="uint" calc="0" ver1="4.2.1.0">Deprecated. Array is always zero length on disk write.</field>
+        <field name="Unknown Int 3" type="uint" ver2="3.1" />
     </niobject>
 
     <niobject name="NiColorData" inherit="NiObject" module="NiAnimation">
         Wrapper for color animation keys.
-        <add name="Data" type="KeyGroup" template="Color4">The color keys.</add>
+        <field name="Data" type="KeyGroup" template="Color4">The color keys.</field>
     </niobject>
 
     <niobject name="NiColorExtraData" inherit="NiExtraData" module="NiMain">
         Extra data in the form of NiColorA (red, green, blue, alpha).
-        <add name="Data" type="Color4">RGBA Color?</add>
+        <field name="Data" type="Color4">RGBA Color?</field>
     </niobject>
 
     <niobject name="NiControllerManager" inherit="NiTimeController" module="NiAnimation">
         Controls animation sequences on a specific branch of the scene graph.
-        <add name="Cumulative" type="bool">Whether transformation accumulation is enabled. If accumulation is not enabled, the manager will treat all sequence data on the accumulation root as absolute data instead of relative delta values.</add>
-        <add name="Num Controller Sequences" type="uint" />
-        <add name="Controller Sequences" type="Ref" template="NiControllerSequence" arr1="Num Controller Sequences" />
-        <add name="Object Palette" type="Ref" template="NiDefaultAVObjectPalette" />
+        <field name="Cumulative" type="bool">Whether transformation accumulation is enabled. If accumulation is not enabled, the manager will treat all sequence data on the accumulation root as absolute data instead of relative delta values.</field>
+        <field name="Num Controller Sequences" type="uint" />
+        <field name="Controller Sequences" type="Ref" template="NiControllerSequence" arr1="Num Controller Sequences" />
+        <field name="Object Palette" type="Ref" template="NiDefaultAVObjectPalette" />
     </niobject>
 
     <niobject name="NiSequence" inherit="NiObject" module="NiAnimation">
         Root node in NetImmerse .kf files (until version 10.0).
-        <add name="Name" type="string">The sequence name by which the animation system finds and manages this sequence.</add>
-        <add name="Accum Root Name" type="string" ver2="10.1.0.103">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
-        <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver2="10.1.0.103" />
-        <add name="Num DIV2 Ints" type="uint" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
-        <add name="DIV2 Ints" type="int" arr1="Num DIV2 Ints" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
-        <add name="DIV2 Ref" type="Ref" template="NiObject" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
-        <add name="Num Controlled Blocks" type="uint" />
-        <add name="Array Grow By" type="uint" default="1" ver1="10.1.0.106" />
-        <add name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" />
+        <field name="Name" type="string">The sequence name by which the animation system finds and manages this sequence.</field>
+        <field name="Accum Root Name" type="string" ver2="10.1.0.103">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</field>
+        <field name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver2="10.1.0.103" />
+        <field name="Num DIV2 Ints" type="uint" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
+        <field name="DIV2 Ints" type="int" arr1="Num DIV2 Ints" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
+        <field name="DIV2 Ref" type="Ref" template="NiObject" ver1="20.3.0.9" ver2="20.3.0.9" vercond="#DIVINITY2#" />
+        <field name="Num Controlled Blocks" type="uint" />
+        <field name="Array Grow By" type="uint" default="1" ver1="10.1.0.106" />
+        <field name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" />
     </niobject>
 
     <niobject name="NiControllerSequence" inherit="NiSequence" module="NiAnimation">
         Root node in Gamebryo .kf files (version 10.0.1.0 and up).
-        <add name="Weight" type="float" default="1.0" ver1="10.1.0.106">The weight of a sequence describes how it blends with other sequences at the same priority.</add>
-        <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver1="10.1.0.106" />
-        <add name="Cycle Type" type="CycleType" default="CYCLE_CLAMP" ver1="10.1.0.106" />
-        <add name="Frequency" type="float" default="1.0" ver1="10.1.0.106" />
+        <field name="Weight" type="float" default="1.0" ver1="10.1.0.106">The weight of a sequence describes how it blends with other sequences at the same priority.</field>
+        <field name="Text Keys" type="Ref" template="NiTextKeyExtraData" ver1="10.1.0.106" />
+        <field name="Cycle Type" type="CycleType" default="CYCLE_CLAMP" ver1="10.1.0.106" />
+        <field name="Frequency" type="float" default="1.0" ver1="10.1.0.106" />
         <!-- Actually 10.3.0.1 but WorldShift 10.4.0.1 custom version acts like 10.3.0.1 -->
-        <add name="Phase" type="float" ver1="10.1.0.106" ver2="10.4.0.1" />
-        <add name="Start Time" type="float" default="#FLT_MAX#" ver1="10.1.0.106" />
-        <add name="Stop Time" type="float" default="#FLT_MIN#" ver1="10.1.0.106" />
-        <add name="Play Backwards" type="bool" ver1="10.1.0.106" ver2="10.1.0.106" />
-        <add name="Manager" type="Ptr" template="NiControllerManager" ver1="10.1.0.106">The owner of this sequence.</add>
-        <add name="Accum Root Name" type="string" ver1="10.1.0.106">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
-        <add name="Accum Flags" type="AccumFlags" default="ACCUM_X_FRONT" ver1="20.3.0.8" />
-        <add name="String Palette" type="Ref" template="NiStringPalette" ver1="10.1.0.113" ver2="20.1.0.0" />
-        <add name="Anim Notes" type="Ref" template="BSAnimNotes" ver1="20.2.0.7" vercond="(#BSVER# #GTE# 24) #AND# (#BSVER# #LTE# 28)" />
-        <add name="Num Anim Note Arrays" type="ushort" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
-        <add name="Anim Note Arrays" type="Ref" template="BSAnimNotes" arr1="Num Anim Note Arrays" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
+        <field name="Phase" type="float" ver1="10.1.0.106" ver2="10.4.0.1" />
+        <field name="Start Time" type="float" default="#FLT_MAX#" ver1="10.1.0.106" />
+        <field name="Stop Time" type="float" default="#FLT_MIN#" ver1="10.1.0.106" />
+        <field name="Play Backwards" type="bool" ver1="10.1.0.106" ver2="10.1.0.106" />
+        <field name="Manager" type="Ptr" template="NiControllerManager" ver1="10.1.0.106">The owner of this sequence.</field>
+        <field name="Accum Root Name" type="string" ver1="10.1.0.106">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</field>
+        <field name="Accum Flags" type="AccumFlags" default="ACCUM_X_FRONT" ver1="20.3.0.8" />
+        <field name="String Palette" type="Ref" template="NiStringPalette" ver1="10.1.0.113" ver2="20.1.0.0" />
+        <field name="Anim Notes" type="Ref" template="BSAnimNotes" ver1="20.2.0.7" vercond="(#BSVER# #GTE# 24) #AND# (#BSVER# #LTE# 28)" />
+        <field name="Num Anim Note Arrays" type="ushort" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
+        <field name="Anim Note Arrays" type="Ref" template="BSAnimNotes" arr1="Num Anim Note Arrays" ver1="20.2.0.7" vercond="#BSVER# #GT# 28" />
     </niobject>
 
     <niobject name="NiAVObjectPalette" abstract="true" inherit="NiObject" module="NiMain">
@@ -4138,9 +4138,9 @@
 
     <niobject name="NiDefaultAVObjectPalette" inherit="NiAVObjectPalette" module="NiMain">
         NiAVObjectPalette implementation. Used to quickly look up objects by name.
-        <add name="Scene" type="Ptr" template="NiAVObject">Scene root of the object palette.</add>
-        <add name="Num Objs" type="uint">Number of objects.</add>
-        <add name="Objs" type="AVObject" arr1="Num Objs">The objects.</add>
+        <field name="Scene" type="Ptr" template="NiAVObject">Scene root of the object palette.</field>
+        <field name="Num Objs" type="uint">Number of objects.</field>
+        <field name="Objs" type="AVObject" arr1="Num Objs">The objects.</field>
     </niobject>
 
     <niobject name="NiDirectionalLight" inherit="NiLight" module="NiMain">
@@ -4149,51 +4149,51 @@
 
     <niobject name="NiDitherProperty" inherit="NiProperty" module="NiMain">
         NiDitherProperty allows the application to turn the dithering of interpolated colors and fog values on and off.
-        <add name="Flags" type="DitherFlags" />
+        <field name="Flags" type="DitherFlags" />
     </niobject>
 
     <niobject name="NiRollController" inherit="NiSingleInterpController" module="NiAnimation" until="V20_5_0_0">
         DEPRECATED (10.2), REMOVED (20.5). Replaced by NiTransformController and NiLookAtInterpolator.
-        <add name="Data" type="Ref" template="NiFloatData">The data for the controller.</add>
+        <field name="Data" type="Ref" template="NiFloatData">The data for the controller.</field>
     </niobject>
 
     <niobject name="NiFloatData" inherit="NiObject" module="NiAnimation">
         Wrapper for 1D (one-dimensional) floating point animation keys.
-        <add name="Data" type="KeyGroup" template="float">The keys.</add>
+        <field name="Data" type="KeyGroup" template="float">The keys.</field>
     </niobject>
 
     <niobject name="NiFloatExtraData" inherit="NiExtraData" module="NiMain">
         Extra float data.
-        <add name="Float Data" type="float">The float data.</add>
+        <field name="Float Data" type="float">The float data.</field>
     </niobject>
 
     <niobject name="NiFloatsExtraData" inherit="NiExtraData" module="NiMain">
         Extra float array data.
-        <add name="Num Floats" type="uint">Number of floats in the next field.</add>
-        <add name="Data" type="float" arr1="Num Floats">Float data.</add>
+        <field name="Num Floats" type="uint">Number of floats in the next field.</field>
+        <field name="Data" type="float" arr1="Num Floats">Float data.</field>
     </niobject>
 
     <niobject name="NiFogProperty" inherit="NiProperty" module="NiMain">
         NiFogProperty allows the application to enable, disable and control the appearance of fog.
-        <add name="Flags" type="FogFlags" />
-        <add name="Fog Depth" type="float" default="1.0">Depth of the fog in normalized units. 1.0 = begins at near plane. 0.5 = begins halfway between the near and far planes.</add>
-        <add name="Fog Color" type="Color3" default="#VEC3_ZERO#">The color of the fog.</add>
+        <field name="Flags" type="FogFlags" />
+        <field name="Fog Depth" type="float" default="1.0">Depth of the fog in normalized units. 1.0 = begins at near plane. 0.5 = begins halfway between the near and far planes.</field>
+        <field name="Fog Color" type="Color3" default="#VEC3_ZERO#">The color of the fog.</field>
     </niobject>
 
     <niobject name="NiGravity" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier. Applies a gravitational field on the particles.
-        <add name="Decay" type="float" ver1="3.3.0.13" />
-        <add name="Force" type="float">The strength/force of this gravity.</add>
-        <add name="Type" type="FieldType">The force field type.</add>
-        <add name="Position" type="Vector3">The position of the mass point relative to the particle system.</add>
-        <add name="Direction" type="Vector3">The direction of the applied acceleration.</add>
-        <add name="Unknown 01" type="float" ver2="2.3" />
-        <add name="Unknown 02" type="float" ver2="2.3" />
+        <field name="Decay" type="float" ver1="3.3.0.13" />
+        <field name="Force" type="float">The strength/force of this gravity.</field>
+        <field name="Type" type="FieldType">The force field type.</field>
+        <field name="Position" type="Vector3">The position of the mass point relative to the particle system.</field>
+        <field name="Direction" type="Vector3">The direction of the applied acceleration.</field>
+        <field name="Unknown 01" type="float" ver2="2.3" />
+        <field name="Unknown 02" type="float" ver2="2.3" />
     </niobject>
 
     <niobject name="NiIntegerExtraData" inherit="NiExtraData" module="NiMain">
         Extra integer data.
-        <add name="Integer Data" type="uint">The value of the extra data.</add>
+        <field name="Integer Data" type="uint">The value of the extra data.</field>
     </niobject>
 
     <niobject name="BSXFlags" inherit="NiIntegerExtraData" module="BSMain" versions="#BETHESDA#">
@@ -4216,25 +4216,25 @@
 
     <niobject name="NiIntegersExtraData" inherit="NiExtraData" module="NiMain">
         Extra integer array data.
-        <add name="Num Integers" type="uint">Number of integers.</add>
-        <add name="Data" type="uint" arr1="Num Integers">Integers.</add>
+        <field name="Num Integers" type="uint">Number of integers.</field>
+        <field name="Data" type="uint" arr1="Num Integers">Integers.</field>
     </niobject>
 
     <niobject name="BSKeyframeController" inherit="NiKeyframeController" module="BSAnimation" versions="#BETHESDA#">
         An extended keyframe controller.
-        <add name="Data 2" type="Ref" template="NiKeyframeData">A link to more keyframe data.</add>
+        <field name="Data 2" type="Ref" template="NiKeyframeData">A link to more keyframe data.</field>
     </niobject>
 
     <niobject name="NiKeyframeData" inherit="NiObject" module="NiAnimation">
         DEPRECATED (10.2), RENAMED (10.2) to NiTransformData.
         Wrapper for transformation animation keys.
-        <add name="Num Rotation Keys" type="uint">The number of quaternion rotation keys. If the rotation type is XYZ (type 4) then this *must* be set to 1, and in this case the actual number of keys is stored in the XYZ Rotations field.</add>
-        <add name="Rotation Type" type="KeyType" cond="Num Rotation Keys != 0">The type of interpolation to use for rotation.  Can also be 4 to indicate that separate X, Y, and Z values are used for the rotation instead of Quaternions.</add>
-        <add name="Quaternion Keys" type="QuatKey" arg="Rotation Type" template="Quaternion" arr1="Num Rotation Keys" cond="Rotation Type != 4">The rotation keys if Quaternion rotation is used.</add>
-        <add name="Order" type="float" cond="Rotation Type == 4" ver2="10.1.0.0" />
-        <add name="XYZ Rotations" type="KeyGroup" template="float" arr1="3" cond="Rotation Type == 4">Individual arrays of keys for rotating X, Y, and Z individually.</add>
-        <add name="Translations" type="KeyGroup" template="Vector3">Translation keys.</add>
-        <add name="Scales" type="KeyGroup" template="float">Scale keys.</add>
+        <field name="Num Rotation Keys" type="uint">The number of quaternion rotation keys. If the rotation type is XYZ (type 4) then this *must* be set to 1, and in this case the actual number of keys is stored in the XYZ Rotations field.</field>
+        <field name="Rotation Type" type="KeyType" cond="Num Rotation Keys != 0">The type of interpolation to use for rotation.  Can also be 4 to indicate that separate X, Y, and Z values are used for the rotation instead of Quaternions.</field>
+        <field name="Quaternion Keys" type="QuatKey" arg="Rotation Type" template="Quaternion" arr1="Num Rotation Keys" cond="Rotation Type != 4">The rotation keys if Quaternion rotation is used.</field>
+        <field name="Order" type="float" cond="Rotation Type == 4" ver2="10.1.0.0" />
+        <field name="XYZ Rotations" type="KeyGroup" template="float" arr1="3" cond="Rotation Type == 4">Individual arrays of keys for rotating X, Y, and Z individually.</field>
+        <field name="Translations" type="KeyGroup" template="Vector3">Translation keys.</field>
+        <field name="Scales" type="KeyGroup" template="float">Scale keys.</field>
     </niobject>
 
     <bitflags name="LookAtFlags" storage="ushort">
@@ -4246,48 +4246,48 @@
     <niobject name="NiLookAtController" inherit="NiTimeController" module="NiAnimation" until="V20_5_0_0">
         DEPRECATED (10.2), REMOVED (20.5)
         Replaced by NiTransformController and NiLookAtInterpolator.
-        <add name="Look At Flags" type="LookAtFlags" ver1="10.1.0.0" />
-        <add name="Look At" type="Ptr" template="NiNode" />
+        <field name="Look At Flags" type="LookAtFlags" ver1="10.1.0.0" />
+        <field name="Look At" type="Ptr" template="NiNode" />
     </niobject>
 
     <niobject name="NiLookAtInterpolator" inherit="NiInterpolator" module="NiAnimation">
         NiLookAtInterpolator rotates an object so that it always faces a target object.
-        <add name="Flags" type="LookAtFlags" />
-        <add name="Look At" type="Ptr" template="NiNode" />
-        <add name="Look At Name" type="string" />
-        <add name="Transform" type="NiQuatTransform" ver2="20.4.0.12" />
-        <add name="Interpolator: Translation" type="Ref" template="NiPoint3Interpolator" />
-        <add name="Interpolator: Roll" type="Ref" template="NiFloatInterpolator" />
-        <add name="Interpolator: Scale" type="Ref" template="NiFloatInterpolator" />
+        <field name="Flags" type="LookAtFlags" />
+        <field name="Look At" type="Ptr" template="NiNode" />
+        <field name="Look At Name" type="string" />
+        <field name="Transform" type="NiQuatTransform" ver2="20.4.0.12" />
+        <field name="Interpolator: Translation" type="Ref" template="NiPoint3Interpolator" />
+        <field name="Interpolator: Roll" type="Ref" template="NiFloatInterpolator" />
+        <field name="Interpolator: Scale" type="Ref" template="NiFloatInterpolator" />
     </niobject>
 
     <niobject name="NiMaterialProperty" inherit="NiProperty" module="NiMain">
         Describes the surface properties of an object e.g. translucency, ambient color, diffuse color, emissive color, and specular color.
-        <add name="Flags" type="ushort" ver1="3.0" ver2="10.0.1.2">Property flags.</add>
-        <add name="Ambient Color" type="Color3" default="#VEC3_ONE#" vercond="#BSVER# #LT# 26">How much the material reflects ambient light.</add>
-        <add name="Diffuse Color" type="Color3" default="#VEC3_ONE#" vercond="#BSVER# #LT# 26">How much the material reflects diffuse light.</add>
-        <add name="Specular Color" type="Color3" default="#VEC3_ONE#">How much light the material reflects in a specular manner.</add>
-        <add name="Emissive Color" type="Color3" default="#VEC3_ZERO#">How much light the material emits.</add>
-        <add name="Glossiness" type="float" default="10.0">The material glossiness.</add>
-        <add name="Alpha" type="float" default="1.0">The material transparency (1=non-transparant). Refer to a NiAlphaProperty object in this material's parent NiTriShape object, when alpha is not 1.</add>
-        <add name="Emissive Mult" type="float" default="1.0" vercond="#BSVER# #GT# 21" />
+        <field name="Flags" type="ushort" ver1="3.0" ver2="10.0.1.2">Property flags.</field>
+        <field name="Ambient Color" type="Color3" default="#VEC3_ONE#" vercond="#BSVER# #LT# 26">How much the material reflects ambient light.</field>
+        <field name="Diffuse Color" type="Color3" default="#VEC3_ONE#" vercond="#BSVER# #LT# 26">How much the material reflects diffuse light.</field>
+        <field name="Specular Color" type="Color3" default="#VEC3_ONE#">How much light the material reflects in a specular manner.</field>
+        <field name="Emissive Color" type="Color3" default="#VEC3_ZERO#">How much light the material emits.</field>
+        <field name="Glossiness" type="float" default="10.0">The material glossiness.</field>
+        <field name="Alpha" type="float" default="1.0">The material transparency (1=non-transparant). Refer to a NiAlphaProperty object in this material's parent NiTriShape object, when alpha is not 1.</field>
+        <field name="Emissive Mult" type="float" default="1.0" vercond="#BSVER# #GT# 21" />
     </niobject>
 
     <niobject name="NiMorphData" inherit="NiObject" module="NiAnimation">
         DEPRECATED (20.5), replaced by NiMorphMeshModifier.
         Geometry morphing data.
-        <add name="Num Morphs" type="uint">Number of morphing object.</add>
-        <add name="Num Vertices" type="uint">Number of vertices.</add>
-        <add name="Relative Targets" type="byte" default="1">This byte is always 1 in all official files.</add>
-        <add name="Morphs" type="Morph" arg="Num Vertices" arr1="Num Morphs">The geometry morphing objects.</add>
+        <field name="Num Morphs" type="uint">Number of morphing object.</field>
+        <field name="Num Vertices" type="uint">Number of vertices.</field>
+        <field name="Relative Targets" type="byte" default="1">This byte is always 1 in all official files.</field>
+        <field name="Morphs" type="Morph" arg="Num Vertices" arr1="Num Morphs">The geometry morphing objects.</field>
     </niobject>
 
     <niobject name="NiNode" inherit="NiAVObject" module="NiMain">
         Generic node object for grouping.
-        <add name="Num Children" type="uint">The number of child objects.</add>
-        <add name="Children" type="Ref" template="NiAVObject" arr1="Num Children">List of child node object indices.</add>
-        <add name="Num Effects" type="uint" vercond="#NI_BS_LT_FO4#">The number of references to effect objects that follow.</add>
-        <add name="Effects" type="Ref" template="NiDynamicEffect" arr1="Num Effects" vercond="#NI_BS_LT_FO4#">List of node effects. ADynamicEffect?</add>
+        <field name="Num Children" type="uint">The number of child objects.</field>
+        <field name="Children" type="Ref" template="NiAVObject" arr1="Num Children">List of child node object indices.</field>
+        <field name="Num Effects" type="uint" vercond="#NI_BS_LT_FO4#">The number of references to effect objects that follow.</field>
+        <field name="Effects" type="Ref" template="NiDynamicEffect" arr1="Num Effects" vercond="#NI_BS_LT_FO4#">List of node effects. ADynamicEffect?</field>
     </niobject>
 
     <niobject name="NiBone" inherit="NiNode" module="NiLegacy">
@@ -4304,8 +4304,8 @@
 
     <niobject name="FxWidget" inherit="NiNode" module="NiCustom" versions="V10_0_1_0">
         Firaxis-specific UI widgets?
-        <add name="Unknown 3" type="byte" />
-        <add name="Unknown 292 Bytes" type="byte" arr1="292" />
+        <field name="Unknown 3" type="byte" />
+        <field name="Unknown 292 Bytes" type="byte" arr1="292" />
     </niobject>
 
     <niobject name="FxButton" inherit="FxWidget" module="NiCustom" versions="V10_0_1_0">
@@ -4314,11 +4314,11 @@
 
     <niobject name="FxRadioButton" inherit="FxWidget" module="NiCustom" versions="V10_0_1_0">
         Unknown.
-        <add name="Unknown Int 1" type="uint" />
-        <add name="Unknown Int 2" type="uint" />
-        <add name="Unknown Int 3" type="uint" />
-        <add name="Num Buttons" type="uint">Number of unknown links.</add>
-        <add name="Buttons" type="Ptr" template="FxRadioButton" arr1="Num Buttons">Unknown pointers to other buttons.  Maybe other buttons in a group so they can be switch off if this one is switched on?</add>
+        <field name="Unknown Int 1" type="uint" />
+        <field name="Unknown Int 2" type="uint" />
+        <field name="Unknown Int 3" type="uint" />
+        <field name="Num Buttons" type="uint">Number of unknown links.</field>
+        <field name="Buttons" type="Ptr" template="FxRadioButton" arr1="Num Buttons">Unknown pointers to other buttons.  Maybe other buttons in a group so they can be switch off if this one is switched on?</field>
     </niobject>
 
     <niobject name="NiBillboardNode" inherit="NiNode" module="NiMain">
@@ -4341,7 +4341,7 @@
         01 ROTATE_ABOUT_UP
         10 RIGID_FACE_CAMERA
         11 ALWAYS_FACE_CENTER
-        <add name="Billboard Mode" type="BillboardMode" ver1="10.1.0.0">The way the billboard will react to the camera.</add>
+        <field name="Billboard Mode" type="BillboardMode" ver1="10.1.0.0">The way the billboard will react to the camera.</field>
     </niobject>
 
     <niobject name="NiBSAnimationNode" inherit="NiNode" module="BSLegacy" until="V10_0_1_0">
@@ -4360,60 +4360,60 @@
 
     <niobject name="NiSwitchNode" inherit="NiNode" module="NiMain">
         Represents groups of multiple scenegraph subtrees, only one of which (the "active child") is drawn at any given time.
-        <add name="Switch Node Flags" type="NiSwitchFlags" default="3" ver1="10.1.0.0" />
-        <add name="Index" type="uint" />
+        <field name="Switch Node Flags" type="NiSwitchFlags" default="3" ver1="10.1.0.0" />
+        <field name="Index" type="uint" />
     </niobject>
 
     <niobject name="NiLODNode" inherit="NiSwitchNode" module="NiMain">
         Level of detail selector. Links to different levels of detail of the same model, used to switch a geometry at a specified distance.
-        <add name="LOD Center" type="Vector3" ver1="4.0.0.2" ver2="10.0.1.0" />
-        <add name="Num LOD Levels" type="uint" ver2="10.0.1.0" />
-        <add name="LOD Levels" type="LODRange" arr1="Num LOD Levels" ver2="10.0.1.0" />
-        <add name="LOD Level Data" type="Ref" template="NiLODData" ver1="10.1.0.0" />
+        <field name="LOD Center" type="Vector3" ver1="4.0.0.2" ver2="10.0.1.0" />
+        <field name="Num LOD Levels" type="uint" ver2="10.0.1.0" />
+        <field name="LOD Levels" type="LODRange" arr1="Num LOD Levels" ver2="10.0.1.0" />
+        <field name="LOD Level Data" type="Ref" template="NiLODData" ver1="10.1.0.0" />
     </niobject>
 
     <niobject name="NiPalette" inherit="NiObject" module="NiMain">
         NiPalette objects represent mappings from 8-bit indices to 24-bit RGB or 32-bit RGBA colors.
-        <add name="Has Alpha" type="byte">Not boolean but used as one, always 8-bit.</add>
-        <add name="Num Entries" type="uint" default="256">The number of palette entries. Always 256 but can also be 16.</add>
-        <add name="Palette" type="ByteColor4" arr1="16" cond="Num Entries == 16">The color palette.</add>
-        <add name="Palette" type="ByteColor4" arr1="256" cond="Num Entries != 16">The color palette.</add>
+        <field name="Has Alpha" type="byte">Not boolean but used as one, always 8-bit.</field>
+        <field name="Num Entries" type="uint" default="256">The number of palette entries. Always 256 but can also be 16.</field>
+        <field name="Palette" type="ByteColor4" arr1="16" cond="Num Entries == 16">The color palette.</field>
+        <field name="Palette" type="ByteColor4" arr1="256" cond="Num Entries != 16">The color palette.</field>
     </niobject>
 
     <niobject name="NiParticleBomb" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Decay" type="float" />
-        <add name="Duration" type="float" />
-        <add name="DeltaV" type="float" />
-        <add name="Start" type="float" />
-        <add name="Decay Type" type="DecayType" />
-        <add name="Symmetry Type" type="SymmetryType" ver1="4.1.0.12" />
-        <add name="Position" type="Vector3">The position of the mass point relative to the particle system?</add>
-        <add name="Direction" type="Vector3">The direction of the applied acceleration?</add>
+        <field name="Decay" type="float" />
+        <field name="Duration" type="float" />
+        <field name="DeltaV" type="float" />
+        <field name="Start" type="float" />
+        <field name="Decay Type" type="DecayType" />
+        <field name="Symmetry Type" type="SymmetryType" ver1="4.1.0.12" />
+        <field name="Position" type="Vector3">The position of the mass point relative to the particle system?</field>
+        <field name="Direction" type="Vector3">The direction of the applied acceleration?</field>
     </niobject>
 
     <niobject name="NiParticleColorModifier" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Color Data" type="Ref" template="NiColorData" />
+        <field name="Color Data" type="Ref" template="NiColorData" />
     </niobject>
 
     <niobject name="NiParticleGrowFade" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Grow" type="float">The time from the beginning of the particle lifetime during which the particle grows.</add>
-        <add name="Fade" type="float">The time from the end of the particle lifetime during which the particle fades.</add>
+        <field name="Grow" type="float">The time from the beginning of the particle lifetime during which the particle grows.</field>
+        <field name="Fade" type="float">The time from the end of the particle lifetime during which the particle fades.</field>
     </niobject>
 
     <niobject name="NiParticleMeshModifier" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Num Particle Meshes" type="uint" />
-        <add name="Particle Meshes" arr1="Num Particle Meshes" type="Ref" template="NiAVObject" />
+        <field name="Num Particle Meshes" type="uint" />
+        <field name="Particle Meshes" arr1="Num Particle Meshes" type="Ref" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiParticleRotation" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Random Initial Axis" type="byte" />
-        <add name="Initial Axis" type="Vector3" />
-        <add name="Rotation Speed" type="float" />
+        <field name="Random Initial Axis" type="byte" />
+        <field name="Initial Axis" type="Vector3" />
+        <field name="Rotation Speed" type="float" />
     </niobject>
 
     <niobject name="NiParticles" inherit="NiGeometry" module="NiMain">
@@ -4430,23 +4430,23 @@
 
     <niobject name="NiParticleMeshesData" inherit="NiRotatingParticlesData" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1). Particle meshes data.
-        <add name="Container Node" type="Ref" template="NiNode" />
+        <field name="Container Node" type="Ref" template="NiNode" />
     </niobject>
 
     <niobject name="NiParticleSystem" inherit="NiParticles" module="NiParticle">
         A particle system.
         Contains members to mimic inheritance shifts for Bethesda 20.2, where NiParticles switched to inheriting BSGeometry.
         Until inheritance shifts are supported, the members are on NiParticleSystem instead of NiParticles for module reasons.
-        <add name="Vertex Desc" type="BSVertexDesc" vercond="#BS_GTE_SSE#" />
-        <add name="Far Begin" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Far End" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Near Begin" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Near End" type="ushort" vercond="#BS_GTE_SKY#" />
-        <add name="Data" type="Ref" template="NiPSysData" vercond="#BS_GTE_SSE#" />
+        <field name="Vertex Desc" type="BSVertexDesc" vercond="#BS_GTE_SSE#" />
+        <field name="Far Begin" type="ushort" vercond="#BS_GTE_SKY#" />
+        <field name="Far End" type="ushort" vercond="#BS_GTE_SKY#" />
+        <field name="Near Begin" type="ushort" vercond="#BS_GTE_SKY#" />
+        <field name="Near End" type="ushort" vercond="#BS_GTE_SKY#" />
+        <field name="Data" type="Ref" template="NiPSysData" vercond="#BS_GTE_SSE#" />
 
-        <add name="World Space" type="bool" default="1" ver1="10.1.0.0">If true, Particles are birthed into world space.  If false, Particles are birthed into object space.</add>
-        <add name="Num Modifiers" type="uint" ver1="10.1.0.0">The number of modifier references.</add>
-        <add name="Modifiers" type="Ref" template="NiPSysModifier" arr1="Num Modifiers" ver1="10.1.0.0">The list of particle modifiers.</add>
+        <field name="World Space" type="bool" default="1" ver1="10.1.0.0">If true, Particles are birthed into world space.  If false, Particles are birthed into object space.</field>
+        <field name="Num Modifiers" type="uint" ver1="10.1.0.0">The number of modifier references.</field>
+        <field name="Modifiers" type="Ref" template="NiPSysModifier" arr1="Num Modifiers" ver1="10.1.0.0">The list of particle modifiers.</field>
     </niobject>
 
     <niobject name="NiMeshParticleSystem" inherit="NiParticleSystem" module="NiParticle">
@@ -4454,61 +4454,61 @@
     </niobject>
 
     <niobject name="NiEmitterModifier" inherit="NiObject" module="NiLegacy" until="V10_0_1_0">
-        <add name="Next Modifier" type="Ref" template="NiEmitterModifier" />
-        <add name="Controller" type="Ptr" template="NiParticleSystemController" />
+        <field name="Next Modifier" type="Ref" template="NiEmitterModifier" />
+        <field name="Controller" type="Ptr" template="NiParticleSystemController" />
     </niobject>
 
     <niobject name="NiParticleSystemController" inherit="NiTimeController" module="NiLegacy" until="V10_0_1_0">
         A generic particle system time controller object.
-        <add name="Old Speed" type="uint" ver2="3.1">Particle speed in old files</add>
-        <add name="Speed" type="float" ver1="3.3.0.13">Particle speed</add>
-        <add name="Speed Variation" type="float">Particle random speed modifier</add>
-        <add name="Declination" type="float">
+        <field name="Old Speed" type="uint" ver2="3.1">Particle speed in old files</field>
+        <field name="Speed" type="float" ver1="3.3.0.13">Particle speed</field>
+        <field name="Speed Variation" type="float">Particle random speed modifier</field>
+        <field name="Declination" type="float">
             vertical emit direction [radians]
             0.0 : up
             1.6 : horizontal
             3.1416 : down
-        </add>
-        <add name="Declination Variation" type="float">emitter's vertical opening angle [radians]</add>
-        <add name="Planar Angle" type="float">horizontal emit direction</add>
-        <add name="Planar Angle Variation" type="float">emitter's horizontal opening angle</add>
-        <add name="Initial Normal" type="Vector3" default="#X_AXIS#" />
-        <add name="Initial Color" type="Color4" default="#VEC4_ONE#" />
-        <add name="Initial Size" type="float" default="1.0">Particle size</add>
-        <add name="Emit Start Time" type="float">Particle emit start time</add>
-        <add name="Emit Stop Time" type="float">Particle emit stop time</add>
-        <add name="Reset Particle System" type="byte" ver1="3.3.0.13" />
-        <add name="Old Emit Rate" type="uint" ver2="3.1">Particle emission rate in old files</add>
-        <add name="Birth Rate" type="float" ver1="3.3.0.13">Particle emission rate (particles per second)</add>
-        <add name="Lifetime" type="float">Particle lifetime</add>
-        <add name="Lifetime Variation" type="float">Particle lifetime random modifier</add>
-        <add name="Use Birth Rate" type="byte" ver1="3.3.0.13" />
-        <add name="Spawn On Death" type="byte" ver1="3.3.0.13" />
-        <add name="Emitter Dimensions" type="Vector3" />
-        <add name="Emitter" type="Ptr" template="NiAVObject">The object which acts as the basis for the particle emitter.</add>
-        <add name="Num Spawn Generations" type="ushort" default="1" ver1="3.3.0.13" />
-        <add name="Percentage Spawned" type="float" default="1.0" ver1="3.3.0.13" />
-        <add name="Spawn Multiplier" type="ushort" ver1="3.3.0.13" />
-        <add name="Spawn Speed Chaos" type="float" ver1="3.3.0.13" />
-        <add name="Spawn Dir Chaos" type="float" ver1="3.3.0.13" />
-        <add name="Particle Velocity" type="Vector3" ver2="3.1">Particle velocity</add>
-        <add name="Particle Unknown Vector" type="Vector3" ver2="3.1" />
-        <add name="Particle Lifetime" type="float" ver2="3.1">The particle's age.</add>
-        <add name="Particle Link" type="Ref" template="NiObject" ver2="3.1" />
-        <add name="Particle Timestamp" type="uint" ver2="3.1">Timestamp of the last update.</add>
-        <add name="Particle Unknown Short" type="ushort" ver2="3.1">Unknown short</add>
-        <add name="Particle Vertex Id" type="ushort" ver2="3.1">Particle/vertex index matches array index</add>
-
-        <add name="Num Particles" type="ushort" ver1="3.3.0.13">Size of the following array. (Maximum number of simultaneous active particles)</add>
-        <add name="Num Valid" type="ushort" ver1="3.3.0.13">Number of valid entries in the following array. (Number of active particles at the time the system was saved)</add>
-        <add name="Particles" type="NiParticleInfo" arr1="Num Particles" ver1="3.3.0.13" />
-        <add name="Emitter Modifier" type="Ref" template="NiEmitterModifier" ver1="3.3.0.13" />
-        <add name="Particle Modifier" type="Ref" template="NiParticleModifier">Link to some optional particle modifiers (NiGravity, NiParticleGrowFade, NiParticleBomb, ...)</add>
-        <add name="Particle Collider" type="Ref" template="NiParticleCollider" />
-        <add name="Static Target Bound" type="byte" ver1="3.3.0.15" />
-        <add name="Color Data" type="Ref" template="NiColorData" ver2="3.1" />
-        <add name="Unknown Float 1" type="float" ver2="3.1" />
-        <add name="Unknown Floats 2" arr1="Particle Unknown Short" type="float" ver2="3.1" />
+        </field>
+        <field name="Declination Variation" type="float">emitter's vertical opening angle [radians]</field>
+        <field name="Planar Angle" type="float">horizontal emit direction</field>
+        <field name="Planar Angle Variation" type="float">emitter's horizontal opening angle</field>
+        <field name="Initial Normal" type="Vector3" default="#X_AXIS#" />
+        <field name="Initial Color" type="Color4" default="#VEC4_ONE#" />
+        <field name="Initial Size" type="float" default="1.0">Particle size</field>
+        <field name="Emit Start Time" type="float">Particle emit start time</field>
+        <field name="Emit Stop Time" type="float">Particle emit stop time</field>
+        <field name="Reset Particle System" type="byte" ver1="3.3.0.13" />
+        <field name="Old Emit Rate" type="uint" ver2="3.1">Particle emission rate in old files</field>
+        <field name="Birth Rate" type="float" ver1="3.3.0.13">Particle emission rate (particles per second)</field>
+        <field name="Lifetime" type="float">Particle lifetime</field>
+        <field name="Lifetime Variation" type="float">Particle lifetime random modifier</field>
+        <field name="Use Birth Rate" type="byte" ver1="3.3.0.13" />
+        <field name="Spawn On Death" type="byte" ver1="3.3.0.13" />
+        <field name="Emitter Dimensions" type="Vector3" />
+        <field name="Emitter" type="Ptr" template="NiAVObject">The object which acts as the basis for the particle emitter.</field>
+        <field name="Num Spawn Generations" type="ushort" default="1" ver1="3.3.0.13" />
+        <field name="Percentage Spawned" type="float" default="1.0" ver1="3.3.0.13" />
+        <field name="Spawn Multiplier" type="ushort" ver1="3.3.0.13" />
+        <field name="Spawn Speed Chaos" type="float" ver1="3.3.0.13" />
+        <field name="Spawn Dir Chaos" type="float" ver1="3.3.0.13" />
+        <field name="Particle Velocity" type="Vector3" ver2="3.1">Particle velocity</field>
+        <field name="Particle Unknown Vector" type="Vector3" ver2="3.1" />
+        <field name="Particle Lifetime" type="float" ver2="3.1">The particle's age.</field>
+        <field name="Particle Link" type="Ref" template="NiObject" ver2="3.1" />
+        <field name="Particle Timestamp" type="uint" ver2="3.1">Timestamp of the last update.</field>
+        <field name="Particle Unknown Short" type="ushort" ver2="3.1">Unknown short</field>
+        <field name="Particle Vertex Id" type="ushort" ver2="3.1">Particle/vertex index matches array index</field>
+
+        <field name="Num Particles" type="ushort" ver1="3.3.0.13">Size of the following array. (Maximum number of simultaneous active particles)</field>
+        <field name="Num Valid" type="ushort" ver1="3.3.0.13">Number of valid entries in the following array. (Number of active particles at the time the system was saved)</field>
+        <field name="Particles" type="NiParticleInfo" arr1="Num Particles" ver1="3.3.0.13" />
+        <field name="Emitter Modifier" type="Ref" template="NiEmitterModifier" ver1="3.3.0.13" />
+        <field name="Particle Modifier" type="Ref" template="NiParticleModifier">Link to some optional particle modifiers (NiGravity, NiParticleGrowFade, NiParticleBomb, ...)</field>
+        <field name="Particle Collider" type="Ref" template="NiParticleCollider" />
+        <field name="Static Target Bound" type="byte" ver1="3.3.0.15" />
+        <field name="Color Data" type="Ref" template="NiColorData" ver2="3.1" />
+        <field name="Unknown Float 1" type="float" ver2="3.1" />
+        <field name="Unknown Floats 2" arr1="Particle Unknown Short" type="float" ver2="3.1" />
     </niobject>
 
     <niobject name="NiBSPArrayController" inherit="NiParticleSystemController" module="BSLegacy" until="V10_0_1_0">
@@ -4518,246 +4518,246 @@
     <niobject name="NiPathController" inherit="NiTimeController" module="NiAnimation" until="V20_5_0_0">
         DEPRECATED (10.2), REMOVED (20.5). Replaced by NiTransformController and NiPathInterpolator.
         Time controller for a path.
-        <add name="Path Flags" type="PathFlags" ver1="10.1.0.0" />
-        <add name="Bank Dir" type="int" default="1">-1 = Negative, 1 = Positive</add>
-        <add name="Max Bank Angle" type="float">Max angle in radians.</add>
-        <add name="Smoothing" type="float" />
-        <add name="Follow Axis" type="short">0, 1, or 2 representing X, Y, or Z.</add>
-        <add name="Path Data" type="Ref" template="NiPosData" />
-        <add name="Percent Data" type="Ref" template="NiFloatData" />
+        <field name="Path Flags" type="PathFlags" ver1="10.1.0.0" />
+        <field name="Bank Dir" type="int" default="1">-1 = Negative, 1 = Positive</field>
+        <field name="Max Bank Angle" type="float">Max angle in radians.</field>
+        <field name="Smoothing" type="float" />
+        <field name="Follow Axis" type="short">0, 1, or 2 representing X, Y, or Z.</field>
+        <field name="Path Data" type="Ref" template="NiPosData" />
+        <field name="Percent Data" type="Ref" template="NiFloatData" />
     </niobject>
 
     <compound name="PixelFormatComponent">
-        <add name="Type" type="PixelComponent">Component Type</add>
-        <add name="Convention" type="PixelRepresentation">Data Storage Convention</add>
-        <add name="Bits Per Channel" type="byte">Bits per component</add>
-        <add name="Is Signed" type="bool" />
+        <field name="Type" type="PixelComponent">Component Type</field>
+        <field name="Convention" type="PixelRepresentation">Data Storage Convention</field>
+        <field name="Bits Per Channel" type="byte">Bits per component</field>
+        <field name="Is Signed" type="bool" />
     </compound>
 
     <niobject name="NiPixelFormat" abstract="true" inherit="NiObject" module="NiMain">
         NiPixelFormat is not the parent to NiPixelData/NiPersistentSrcTextureRendererData,
         but actually a member class loaded at the top of each. The two classes are not related.
         However, faking this inheritance is useful for several things.
-        <add name="Pixel Format" type="PixelFormat">The format of the pixels in this internally stored image.</add>
+        <field name="Pixel Format" type="PixelFormat">The format of the pixels in this internally stored image.</field>
         <!-- Technically since 10.3.0.3, fudging for WorldShift custom version as no games have official 10.3 NIFs anyway. -->
-        <add name="Red Mask" type="uint" ver2="10.4.0.1">0x000000ff (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</add>
-        <add name="Green Mask" type="uint" ver2="10.4.0.1">0x0000ff00 (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</add>
-        <add name="Blue Mask" type="uint" ver2="10.4.0.1">0x00ff0000 (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</add>
-        <add name="Alpha Mask" type="uint" ver2="10.4.0.1">0xff000000 (for 32bpp) or 0x00000000 (for 24bpp and 8bpp)</add>
-        <add name="Bits Per Pixel" type="uint" ver2="10.4.0.1">Bits per pixel, 0 (Compressed), 8, 24 or 32.</add>
-        <add name="Old Fast Compare" type="byte" arr1="8" ver2="10.4.0.1">
+        <field name="Red Mask" type="uint" ver2="10.4.0.1">0x000000ff (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</field>
+        <field name="Green Mask" type="uint" ver2="10.4.0.1">0x0000ff00 (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</field>
+        <field name="Blue Mask" type="uint" ver2="10.4.0.1">0x00ff0000 (for 24bpp and 32bpp) or 0x00000000 (for 8bpp)</field>
+        <field name="Alpha Mask" type="uint" ver2="10.4.0.1">0xff000000 (for 32bpp) or 0x00000000 (for 24bpp and 8bpp)</field>
+        <field name="Bits Per Pixel" type="uint" ver2="10.4.0.1">Bits per pixel, 0 (Compressed), 8, 24 or 32.</field>
+        <field name="Old Fast Compare" type="byte" arr1="8" ver2="10.4.0.1">
             [96,8,130,0,0,65,0,0] if 24 bits per pixel
             [129,8,130,32,0,65,12,0] if 32 bits per pixel
             [34,0,0,0,0,0,0,0] if 8 bits per pixel
             [X,0,0,0,0,0,0,0] if 0 (Compressed) bits per pixel where X = PixelFormat
-        </add>
-        <add name="Tiling" type="PixelTiling" ver1="10.1.0.0" ver2="10.4.0.1">Seems to always be zero.</add>
-        <add name="Bits Per Pixel" type="byte" ver1="10.4.0.2">Bits per pixel, 0 (Compressed), 8, 24 or 32.</add>
-        <add name="Renderer Hint" type="uint" ver1="10.4.0.2" />
-        <add name="Extra Data" type="uint" ver1="10.4.0.2" />
-        <add name="Flags" type="byte" ver1="10.4.0.2" />
-        <add name="Tiling" type="PixelTiling" ver1="10.4.0.2" />
-        <add name="sRGB Space" type="bool" ver1="20.3.0.4" />
-        <add name="Channels" type="PixelFormatComponent" arr1="4" ver1="10.4.0.2">Channel Data</add>
+        </field>
+        <field name="Tiling" type="PixelTiling" ver1="10.1.0.0" ver2="10.4.0.1">Seems to always be zero.</field>
+        <field name="Bits Per Pixel" type="byte" ver1="10.4.0.2">Bits per pixel, 0 (Compressed), 8, 24 or 32.</field>
+        <field name="Renderer Hint" type="uint" ver1="10.4.0.2" />
+        <field name="Extra Data" type="uint" ver1="10.4.0.2" />
+        <field name="Flags" type="byte" ver1="10.4.0.2" />
+        <field name="Tiling" type="PixelTiling" ver1="10.4.0.2" />
+        <field name="sRGB Space" type="bool" ver1="20.3.0.4" />
+        <field name="Channels" type="PixelFormatComponent" arr1="4" ver1="10.4.0.2">Channel Data</field>
     </niobject>
 
     <niobject name="NiPersistentSrcTextureRendererData" inherit="NiPixelFormat" module="NiMain">
-        <add name="Palette" type="Ref" template="NiPalette" />
-        <add name="Num Mipmaps" type="uint" />
-        <add name="Bytes Per Pixel" type="uint" />
-        <add name="Mipmaps" type="MipMap" arr1="Num Mipmaps" />
-        <add name="Num Pixels" type="uint" />
-        <add name="Pad Num Pixels" type="uint" ver1="20.2.0.6" />
-        <add name="Num Faces" type="uint" />
-        <add name="Platform" type="PlatformID" ver2="30.1.0.0" />
-        <add name="Renderer" type="RendererID" ver1="30.1.0.1" />
-        <add name="Pixel Data" type="byte" binary="true" arr1="Num Pixels * Num Faces" />
+        <field name="Palette" type="Ref" template="NiPalette" />
+        <field name="Num Mipmaps" type="uint" />
+        <field name="Bytes Per Pixel" type="uint" />
+        <field name="Mipmaps" type="MipMap" arr1="Num Mipmaps" />
+        <field name="Num Pixels" type="uint" />
+        <field name="Pad Num Pixels" type="uint" ver1="20.2.0.6" />
+        <field name="Num Faces" type="uint" />
+        <field name="Platform" type="PlatformID" ver2="30.1.0.0" />
+        <field name="Renderer" type="RendererID" ver1="30.1.0.1" />
+        <field name="Pixel Data" type="byte" binary="true" arr1="Num Pixels * Num Faces" />
     </niobject>
 
     <niobject name="NiPixelData" inherit="NiPixelFormat" module="NiMain">
         A texture.
-        <add name="Palette" type="Ref" template="NiPalette" />
-        <add name="Num Mipmaps" type="uint" />
-        <add name="Bytes Per Pixel" type="uint" />
-        <add name="Mipmaps" type="MipMap" arr1="Num Mipmaps" />
-        <add name="Num Pixels" type="uint" />
+        <field name="Palette" type="Ref" template="NiPalette" />
+        <field name="Num Mipmaps" type="uint" />
+        <field name="Bytes Per Pixel" type="uint" />
+        <field name="Mipmaps" type="MipMap" arr1="Num Mipmaps" />
+        <field name="Num Pixels" type="uint" />
         <!-- Technically since 10.3.0.6, fudging for WorldShift custom version as no games have official 10.3 NIFs anyway. -->
-        <add name="Num Faces" type="uint" ver1="10.4.0.2" default="1" />
-        <add name="Pixel Data" type="byte" binary="true" arr1="Num Pixels" ver2="10.4.0.1" />
-        <add name="Pixel Data" type="byte" binary="true" arr1="Num Pixels * Num Faces" ver1="10.4.0.2" />
+        <field name="Num Faces" type="uint" ver1="10.4.0.2" default="1" />
+        <field name="Pixel Data" type="byte" binary="true" arr1="Num Pixels" ver2="10.4.0.1" />
+        <field name="Pixel Data" type="byte" binary="true" arr1="Num Pixels * Num Faces" ver1="10.4.0.2" />
     </niobject>
 
     <niobject name="NiParticleCollider" inherit="NiParticleModifier" module="NiLegacy" until="V10_0_1_0">
-        <add name="Bounce" type="float" />
-        <add name="Spawn On Collide" type="bool" ver1="4.2.0.2" />
-        <add name="Die On Collide" type="bool" ver1="4.2.0.2" />
+        <field name="Bounce" type="float" />
+        <field name="Spawn On Collide" type="bool" ver1="4.2.0.2" />
+        <field name="Die On Collide" type="bool" ver1="4.2.0.2" />
     </niobject>
 
     <niobject name="NiPlanarCollider" inherit="NiParticleCollider" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Height" type="float" />
-        <add name="Width" type="float" />
-        <add name="Position" type="Vector3" />
-        <add name="X Vector" type="Vector3" />
-        <add name="Y Vector" type="Vector3" />
-        <add name="Plane" type="NiPlane" />
+        <field name="Height" type="float" />
+        <field name="Width" type="float" />
+        <field name="Position" type="Vector3" />
+        <field name="X Vector" type="Vector3" />
+        <field name="Y Vector" type="Vector3" />
+        <field name="Plane" type="NiPlane" />
     </niobject>
 
     <niobject name="NiPointLight" inherit="NiLight" module="NiMain">
         A point light.
-        <add name="Constant Attenuation" type="float" />
-        <add name="Linear Attenuation" type="float" default="1.0" />
-        <add name="Quadratic Attenuation" type="float" />
+        <field name="Constant Attenuation" type="float" />
+        <field name="Linear Attenuation" type="float" default="1.0" />
+        <field name="Quadratic Attenuation" type="float" />
     </niobject>
 
     <niobject name="NiPosData" inherit="NiObject" module="NiAnimation">
         Wrapper for position animation keys.
-        <add name="Data" type="KeyGroup" template="Vector3" />
+        <field name="Data" type="KeyGroup" template="Vector3" />
     </niobject>
 
     <niobject name="NiRotData" inherit="NiObject" module="NiAnimation">
         Wrapper for rotation animation keys.
-        <add name="Num Rotation Keys" type="uint" />
-        <add name="Rotation Type" type="KeyType" cond="Num Rotation Keys != 0" />
-        <add name="Quaternion Keys" type="QuatKey" arg="Rotation Type" template="Quaternion" arr1="Num Rotation Keys" cond="Rotation Type != 4" />
-        <add name="XYZ Rotations" type="KeyGroup" template="float" arr1="3" cond="Rotation Type == 4" />
+        <field name="Num Rotation Keys" type="uint" />
+        <field name="Rotation Type" type="KeyType" cond="Num Rotation Keys != 0" />
+        <field name="Quaternion Keys" type="QuatKey" arg="Rotation Type" template="Quaternion" arr1="Num Rotation Keys" cond="Rotation Type != 4" />
+        <field name="XYZ Rotations" type="KeyGroup" template="float" arr1="3" cond="Rotation Type == 4" />
     </niobject>
 
     <niobject name="NiPSysAgeDeathModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that controls and updates the age of particles in the system.
-        <add name="Spawn on Death" type="bool">Should the particles spawn on death?</add>
-        <add name="Spawn Modifier" type="Ref" template="NiPSysSpawnModifier">The spawner to use on death.</add>
+        <field name="Spawn on Death" type="bool">Should the particles spawn on death?</field>
+        <field name="Spawn Modifier" type="Ref" template="NiPSysSpawnModifier">The spawner to use on death.</field>
     </niobject>
 
     <niobject name="NiPSysBombModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that applies an explosive force to particles.
-        <add name="Bomb Object" type="Ptr" template="NiNode">The object whose position and orientation are the basis of the force.</add>
-        <add name="Bomb Axis" type="Vector3">The local direction of the force.</add>
-        <add name="Decay" type="float">How the bomb force will decrease with distance.</add>
-        <add name="Delta V" type="float">The acceleration the bomb will apply to particles.</add>
-        <add name="Decay Type" type="DecayType" />
-        <add name="Symmetry Type" type="SymmetryType" />
+        <field name="Bomb Object" type="Ptr" template="NiNode">The object whose position and orientation are the basis of the force.</field>
+        <field name="Bomb Axis" type="Vector3">The local direction of the force.</field>
+        <field name="Decay" type="float">How the bomb force will decrease with distance.</field>
+        <field name="Delta V" type="float">The acceleration the bomb will apply to particles.</field>
+        <field name="Decay Type" type="DecayType" />
+        <field name="Symmetry Type" type="SymmetryType" />
     </niobject>
 
     <niobject name="NiPSysBoundUpdateModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that creates and updates bound volumes.
-        <add name="Update Skip" type="ushort">Optimize by only computing the bound of (1 / Update Skip) of the total particles each frame.</add>
+        <field name="Update Skip" type="ushort">Optimize by only computing the bound of (1 / Update Skip) of the total particles each frame.</field>
     </niobject>
 
     <niobject name="NiPSysBoxEmitter" inherit="NiPSysVolumeEmitter" module="NiParticle">
         Particle emitter that uses points within a defined Box shape to emit from.
-        <add name="Width" type="float" />
-        <add name="Height" type="float" />
-        <add name="Depth" type="float" />
+        <field name="Width" type="float" />
+        <field name="Height" type="float" />
+        <field name="Depth" type="float" />
     </niobject>
 
     <niobject name="NiPSysColliderManager" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that adds a defined shape to act as a collision object for particles to interact with.
-        <add name="Collider" type="Ref" template="NiPSysCollider" />
+        <field name="Collider" type="Ref" template="NiPSysCollider" />
     </niobject>
 
     <niobject name="NiPSysColorModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that adds keyframe data to modify color/alpha values of particles over time.
-        <add name="Data" type="Ref" template="NiColorData" />
+        <field name="Data" type="Ref" template="NiColorData" />
     </niobject>
 
     <niobject name="NiPSysCylinderEmitter" inherit="NiPSysVolumeEmitter" module="NiParticle">
         Particle emitter that uses points within a defined Cylinder shape to emit from.
-        <add name="Radius" type="float" />
-        <add name="Height" type="float" />
+        <field name="Radius" type="float" />
+        <field name="Height" type="float" />
     </niobject>
 
     <niobject name="NiPSysDragModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that applies a linear drag force to particles.
-        <add name="Drag Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the force.</add>
-        <add name="Drag Axis" type="Vector3" default="#X_AXIS#">The local direction of the force.</add>
-        <add name="Percentage" type="float" default="0.05">The amount of drag to apply to particles.</add>
-        <add name="Range" type="float" default="#FLT_MAX#">The distance up to which particles are fully affected.</add>
-        <add name="Range Falloff" type="float" default="#FLT_MAX#">The distance at which particles cease to be affected.</add>
+        <field name="Drag Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the force.</field>
+        <field name="Drag Axis" type="Vector3" default="#X_AXIS#">The local direction of the force.</field>
+        <field name="Percentage" type="float" default="0.05">The amount of drag to apply to particles.</field>
+        <field name="Range" type="float" default="#FLT_MAX#">The distance up to which particles are fully affected.</field>
+        <field name="Range Falloff" type="float" default="#FLT_MAX#">The distance at which particles cease to be affected.</field>
     </niobject>
 
     <niobject name="NiPSysEmitterCtlrData" inherit="NiObject" module="NiParticle">
         DEPRECATED (10.2). Particle system emitter controller data.
-        <add name="Birth Rate Keys" type="KeyGroup" template="float" />
-        <add name="Num Active Keys" type="uint" />
-        <add name="Active Keys" type="Key" arg="1" template="byte" arr1="Num Active Keys" />
+        <field name="Birth Rate Keys" type="KeyGroup" template="float" />
+        <field name="Num Active Keys" type="uint" />
+        <field name="Active Keys" type="Key" arg="1" template="byte" arr1="Num Active Keys" />
     </niobject>
 
     <niobject name="NiPSysGravityModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that applies a gravitational force to particles.
-        <add name="Gravity Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the force.</add>
-        <add name="Gravity Axis" type="Vector3" default="#X_AXIS#">The local direction of the force.</add>
-        <add name="Decay" type="float">How the force diminishes by distance.</add>
-        <add name="Strength" type="float" default="1.0">The acceleration of the force.</add>
-        <add name="Force Type" type="ForceType">The type of gravitational force.</add>
-        <add name="Turbulence" type="float">Adds a degree of randomness.</add>
-        <add name="Turbulence Scale" type="float" default="1.0">Scale for turbulence.</add>
-        <add name="World Aligned" type="bool" vercond="!#NI_BS_LTE_16#" />
+        <field name="Gravity Object" type="Ptr" template="NiAVObject">The object whose position and orientation are the basis of the force.</field>
+        <field name="Gravity Axis" type="Vector3" default="#X_AXIS#">The local direction of the force.</field>
+        <field name="Decay" type="float">How the force diminishes by distance.</field>
+        <field name="Strength" type="float" default="1.0">The acceleration of the force.</field>
+        <field name="Force Type" type="ForceType">The type of gravitational force.</field>
+        <field name="Turbulence" type="float">Adds a degree of randomness.</field>
+        <field name="Turbulence Scale" type="float" default="1.0">Scale for turbulence.</field>
+        <field name="World Aligned" type="bool" vercond="!#NI_BS_LTE_16#" />
     </niobject>
 
     <niobject name="NiPSysGrowFadeModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that controls the time it takes to grow and shrink a particle.
-        <add name="Grow Time" type="float">The time taken to grow from 0 to their specified size.</add>
-        <add name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</add>
-        <add name="Fade Time" type="float">The time taken to shrink from their specified size to 0.</add>
-        <add name="Fade Generation" type="ushort">Specifies the particle generation to which the shrink effect should be applied. This is usually the highest supported generation for the particle system.</add>
-        <add name="Base Scale" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_FO3#">A multiplier on the base particle scale.</add>
+        <field name="Grow Time" type="float">The time taken to grow from 0 to their specified size.</field>
+        <field name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</field>
+        <field name="Fade Time" type="float">The time taken to shrink from their specified size to 0.</field>
+        <field name="Fade Generation" type="ushort">Specifies the particle generation to which the shrink effect should be applied. This is usually the highest supported generation for the particle system.</field>
+        <field name="Base Scale" type="float" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_GTE_FO3#">A multiplier on the base particle scale.</field>
     </niobject>
 
     <niobject name="NiPSysMeshEmitter" inherit="NiPSysEmitter" module="NiParticle">
         Particle emitter that uses points on a specified mesh to emit from.
-        <add name="Num Emitter Meshes" type="uint" />
-        <add name="Emitter Meshes" type="Ptr" template="NiAVObject" arr1="Num Emitter Meshes">The meshes which are emitted from.</add>
-        <add name="Initial Velocity Type" type="VelocityType">The method by which the initial particle velocity will be computed.</add>
-        <add name="Emission Type" type="EmitFrom">The manner in which particles are emitted from the Emitter Meshes.</add>
-        <add name="Emission Axis" type="Vector3" default="#X_AXIS#">The emission axis if VELOCITY_USE_DIRECTION.</add>
+        <field name="Num Emitter Meshes" type="uint" />
+        <field name="Emitter Meshes" type="Ptr" template="NiAVObject" arr1="Num Emitter Meshes">The meshes which are emitted from.</field>
+        <field name="Initial Velocity Type" type="VelocityType">The method by which the initial particle velocity will be computed.</field>
+        <field name="Emission Type" type="EmitFrom">The manner in which particles are emitted from the Emitter Meshes.</field>
+        <field name="Emission Axis" type="Vector3" default="#X_AXIS#">The emission axis if VELOCITY_USE_DIRECTION.</field>
     </niobject>
 
     <niobject name="NiPSysMeshUpdateModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that updates mesh particles using the age of each particle.
-        <add name="Num Meshes" type="uint" />
-        <add name="Meshes" type="Ref" template="NiAVObject" arr1="Num Meshes" />
+        <field name="Num Meshes" type="uint" />
+        <field name="Meshes" type="Ref" template="NiAVObject" arr1="Num Meshes" />
     </niobject>
     
     <niobject name="BSPSysInheritVelocityModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
-        <add name="Inherit Object" type="Ptr" template="NiAVObject" />
-        <add name="Chance To Inherit" type="float" default="100.0" />
-        <add name="Velocity Multiplier" type="float" default="0.5" />
-        <add name="Velocity Variation" type="float" />
+        <field name="Inherit Object" type="Ptr" template="NiAVObject" />
+        <field name="Chance To Inherit" type="float" default="100.0" />
+        <field name="Velocity Multiplier" type="float" default="0.5" />
+        <field name="Velocity Variation" type="float" />
     </niobject>
     
     <niobject name="BSPSysHavokUpdateModifier" inherit="NiPSysMeshUpdateModifier" module="BSParticle" versions="#BETHESDA#">
-        <add name="Modifier" type="Ref" template="NiPSysModifier" />
+        <field name="Modifier" type="Ref" template="NiPSysModifier" />
     </niobject>
 
     <niobject name="BSPSysRecycleBoundModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
-        <add name="Bound Offset" type="Vector3" />
-        <add name="Bound Extent" type="Vector3" />
-        <add name="Bound Object" type="Ptr" template="NiAVObject" />
+        <field name="Bound Offset" type="Vector3" />
+        <field name="Bound Extent" type="Vector3" />
+        <field name="Bound Object" type="Ptr" template="NiAVObject" />
     </niobject> 
     
     <niobject name="BSPSysSubTexModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
         Similar to a Flip Controller, this handles particle texture animation on a single texture atlas
-        <add name="Start Frame" type="float">Starting frame/position on atlas</add>
-        <add name="Start Frame Fudge" type="float" default="64.0">Random chance to start on a different frame?</add>
-        <add name="End Frame" type="float" default="63.0">Ending frame/position on atlas</add>
-        <add name="Loop Start Frame" type="float">Frame to start looping</add>
-        <add name="Loop Start Frame Fudge" type="float" />
-        <add name="Frame Count" type="float" default="30.0" />
-        <add name="Frame Count Fudge" type="float" />
+        <field name="Start Frame" type="float">Starting frame/position on atlas</field>
+        <field name="Start Frame Fudge" type="float" default="64.0">Random chance to start on a different frame?</field>
+        <field name="End Frame" type="float" default="63.0">Ending frame/position on atlas</field>
+        <field name="Loop Start Frame" type="float">Frame to start looping</field>
+        <field name="Loop Start Frame Fudge" type="float" />
+        <field name="Frame Count" type="float" default="30.0" />
+        <field name="Frame Count Fudge" type="float" />
     </niobject>
     
     <niobject name="NiPSysPlanarCollider" inherit="NiPSysCollider" module="NiParticle">
         Particle Collider object which particles will interact with.
-        <add name="Width" type="float">Width of the plane along the X Axis.</add>
-        <add name="Height" type="float">Height of the plane along the Y Axis.</add>
-        <add name="X Axis" type="Vector3">Axis defining a plane, relative to Collider Object.</add>
-        <add name="Y Axis" type="Vector3">Axis defining a plane, relative to Collider Object.</add>
+        <field name="Width" type="float">Width of the plane along the X Axis.</field>
+        <field name="Height" type="float">Height of the plane along the Y Axis.</field>
+        <field name="X Axis" type="Vector3">Axis defining a plane, relative to Collider Object.</field>
+        <field name="Y Axis" type="Vector3">Axis defining a plane, relative to Collider Object.</field>
     </niobject>
 
     <niobject name="NiPSysSphericalCollider" inherit="NiPSysCollider" module="NiParticle">
         Particle Collider object which particles will interact with.
-        <add name="Radius" type="float" />
+        <field name="Radius" type="float" />
     </niobject>
 
     <niobject name="NiPSysPositionModifier" inherit="NiPSysModifier" module="NiParticle">
@@ -4770,40 +4770,40 @@
 
     <niobject name="NiPSysRotationModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that adds rotations to particles.
-        <add name="Rotation Speed" type="float">Initial Rotation Speed in radians per second.</add>
-        <add name="Rotation Speed Variation" type="float" ver1="20.0.0.2">Distributes rotation speed over the range [Speed - Variation, Speed + Variation].</add>
-        <add name="Unknown Vector" type="Vector4" vercond="#BS_F76#" />
-        <add name="Unknown Byte" type="byte" vercond="#BS_F76#" />
-        <add name="Rotation Angle" type="float" ver1="20.0.0.2">Initial Rotation Angle in radians.</add>
-        <add name="Rotation Angle Variation" type="float" ver1="20.0.0.2">Distributes rotation angle over the range [Angle - Variation, Angle + Variation].</add>
-        <add name="Random Rot Speed Sign" type="bool" ver1="20.0.0.2">Randomly negate the initial rotation speed?</add>
-        <add name="Random Axis" type="bool" default="1">Assign a random axis to new particles?</add>
-        <add name="Axis" type="Vector3" default="#X_AXIS#">Initial rotation axis.</add>
+        <field name="Rotation Speed" type="float">Initial Rotation Speed in radians per second.</field>
+        <field name="Rotation Speed Variation" type="float" ver1="20.0.0.2">Distributes rotation speed over the range [Speed - Variation, Speed + Variation].</field>
+        <field name="Unknown Vector" type="Vector4" vercond="#BS_F76#" />
+        <field name="Unknown Byte" type="byte" vercond="#BS_F76#" />
+        <field name="Rotation Angle" type="float" ver1="20.0.0.2">Initial Rotation Angle in radians.</field>
+        <field name="Rotation Angle Variation" type="float" ver1="20.0.0.2">Distributes rotation angle over the range [Angle - Variation, Angle + Variation].</field>
+        <field name="Random Rot Speed Sign" type="bool" ver1="20.0.0.2">Randomly negate the initial rotation speed?</field>
+        <field name="Random Axis" type="bool" default="1">Assign a random axis to new particles?</field>
+        <field name="Axis" type="Vector3" default="#X_AXIS#">Initial rotation axis.</field>
     </niobject>
 
     <niobject name="NiPSysSpawnModifier" inherit="NiPSysModifier" module="NiParticle">
         Particle modifier that spawns additional copies of a particle.
-        <add name="Num Spawn Generations" type="ushort" default="0">Number of allowed generations for spawning. Particles whose generations are >= will not be spawned.</add>
-        <add name="Percentage Spawned" type="float" default="1.0">The likelihood of a particular particle being spawned. Must be between 0.0 and 1.0.</add>
-        <add name="Min Num to Spawn" type="ushort" default="1">The minimum particles to spawn for any given original particle.</add>
-        <add name="Max Num to Spawn" type="ushort" default="1">The maximum particles to spawn for any given original particle.</add>
-        <add name="Spawn Speed Variation" type="float">How much the spawned particle speed can vary.</add>
-        <add name="Spawn Dir Variation" type="float">How much the spawned particle direction can vary.</add>
-        <add name="Life Span" type="float">Lifespan assigned to spawned particles.</add>
-        <add name="Life Span Variation" type="float">The amount the lifespan can vary.</add>
-        <add name="WorldShift Spawn Speed Addition" type="float" ver1="10.2.0.1" ver2="10.4.0.1" />
+        <field name="Num Spawn Generations" type="ushort" default="0">Number of allowed generations for spawning. Particles whose generations are >= will not be spawned.</field>
+        <field name="Percentage Spawned" type="float" default="1.0">The likelihood of a particular particle being spawned. Must be between 0.0 and 1.0.</field>
+        <field name="Min Num to Spawn" type="ushort" default="1">The minimum particles to spawn for any given original particle.</field>
+        <field name="Max Num to Spawn" type="ushort" default="1">The maximum particles to spawn for any given original particle.</field>
+        <field name="Spawn Speed Variation" type="float">How much the spawned particle speed can vary.</field>
+        <field name="Spawn Dir Variation" type="float">How much the spawned particle direction can vary.</field>
+        <field name="Life Span" type="float">Lifespan assigned to spawned particles.</field>
+        <field name="Life Span Variation" type="float">The amount the lifespan can vary.</field>
+        <field name="WorldShift Spawn Speed Addition" type="float" ver1="10.2.0.1" ver2="10.4.0.1" />
     </niobject>
 
     <niobject name="NiPSysPartSpawnModifier" inherit="NiPSysModifier" module="NiCustom" versions="V10_2_0_1 V10_3_0_1 V10_4_0_1">
         WorldShift-specific Particle Spawn modifier
-        <add name="Particles Per Second" type="float" default="40.0" />
-        <add name="Time" type="float" default="#FLT_MIN#">Default of FLT_MIN would indicate End Time but it seems more like Frequency/Tick Rate or Start Time.</add>
-        <add name="Spawner" type="Ref" template="NiPSysSpawnModifier" />
+        <field name="Particles Per Second" type="float" default="40.0" />
+        <field name="Time" type="float" default="#FLT_MIN#">Default of FLT_MIN would indicate End Time but it seems more like Frequency/Tick Rate or Start Time.</field>
+        <field name="Spawner" type="Ref" template="NiPSysSpawnModifier" />
     </niobject>
 
     <niobject name="NiPSysSphereEmitter" inherit="NiPSysVolumeEmitter" module="NiParticle">
         Particle emitter that uses points within a sphere shape to emit from.
-        <add name="Radius" type="float" />
+        <field name="Radius" type="float" />
     </niobject>
 
     <niobject name="NiPSysUpdateCtlr" inherit="NiTimeController" module="NiParticle">
@@ -4812,44 +4812,44 @@
 
     <niobject name="NiPSysFieldModifier" abstract="true" inherit="NiPSysModifier" module="NiParticle">
         Base for all force field particle modifiers.
-        <add name="Field Object" type="Ref" template="NiAVObject">The object whose position and orientation are the basis of the field.</add>
-        <add name="Magnitude" type="float">Magnitude of the force.</add>
-        <add name="Attenuation" type="float">How the magnitude diminishes with distance from the Field Object.</add>
-        <add name="Use Max Distance" type="bool">Whether or not to use a distance from the Field Object after which there is no effect.</add>
-        <add name="Max Distance" type="float">Maximum distance after which there is no effect.</add>
+        <field name="Field Object" type="Ref" template="NiAVObject">The object whose position and orientation are the basis of the field.</field>
+        <field name="Magnitude" type="float">Magnitude of the force.</field>
+        <field name="Attenuation" type="float">How the magnitude diminishes with distance from the Field Object.</field>
+        <field name="Use Max Distance" type="bool">Whether or not to use a distance from the Field Object after which there is no effect.</field>
+        <field name="Max Distance" type="float">Maximum distance after which there is no effect.</field>
     </niobject>
 
     <niobject name="NiPSysVortexFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, implements a vortex field force for particles.
-        <add name="Direction" type="Vector3">Direction of the vortex field in Field Object's space.</add>
+        <field name="Direction" type="Vector3">Direction of the vortex field in Field Object's space.</field>
     </niobject>
 
     <niobject name="NiPSysGravityFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, implements a gravity field force for particles.
-        <add name="Direction" type="Vector3" default="#NEG_Y_AXIS#">Direction of the gravity field in Field Object's space.</add>
+        <field name="Direction" type="Vector3" default="#NEG_Y_AXIS#">Direction of the gravity field in Field Object's space.</field>
     </niobject>
 
     <niobject name="NiPSysDragFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, implements a drag field force for particles.
-        <add name="Use Direction" type="bool">Whether or not the drag force applies only in the direction specified.</add>
-        <add name="Direction" type="Vector3">Direction in which the force applies if Use Direction is true.</add>
+        <field name="Use Direction" type="bool">Whether or not the drag force applies only in the direction specified.</field>
+        <field name="Direction" type="Vector3">Direction in which the force applies if Use Direction is true.</field>
     </niobject>
 
     <niobject name="NiPSysTurbulenceFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, implements a turbulence field force for particles.
-        <add name="Frequency" type="float">How many turbulence updates per second.</add>
+        <field name="Frequency" type="float">How many turbulence updates per second.</field>
     </niobject>
 
     <niobject name="BSPSysLODModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
-        <add name="LOD Begin Distance" type="float" default="0.1" />
-        <add name="LOD End Distance" type="float" default="0.7" />
-        <add name="End Emit Scale" type="float" default="0.2" />
-        <add name="End Size" type="float" default="1.0" />
+        <field name="LOD Begin Distance" type="float" default="0.1" />
+        <field name="LOD End Distance" type="float" default="0.7" />
+        <field name="End Emit Scale" type="float" default="0.2" />
+        <field name="End Size" type="float" default="1.0" />
     </niobject>
     
     <niobject name="BSPSysScaleModifier" inherit="NiPSysModifier" module="BSParticle" versions="#BETHESDA#">
-        <add name="Num Scales" type="uint" />
-        <add name="Scales" type="float" arr1="Num Scales" />
+        <field name="Num Scales" type="uint" />
+        <field name="Scales" type="float" arr1="Num Scales" />
     </niobject>
     
     
@@ -4903,24 +4903,24 @@
 
     <niobject name="NiPSysAirFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, updates the particle velocity to simulate the effects of air movements like wind, fans, or wake.
-        <add name="Direction" type="Vector3" default="#NEG_X_AXIS#">Direction of the particle velocity</add>
-        <add name="Air Friction" type="float" range="#F0_1#">How quickly particles will accelerate to the magnitude of the air field.</add>
-        <add name="Inherit Velocity" type="float" range="#F0_1#">How much of the air field velocity will be added to the particle velocity.</add>
-        <add name="Inherit Rotation" type="bool" />
-        <add name="Component Only" type="bool" />
-        <add name="Enable Spread" type="bool" />
-        <add name="Spread" type="float" range="#F0_1#">The angle of the air field cone if Enable Spread is true.</add>
+        <field name="Direction" type="Vector3" default="#NEG_X_AXIS#">Direction of the particle velocity</field>
+        <field name="Air Friction" type="float" range="#F0_1#">How quickly particles will accelerate to the magnitude of the air field.</field>
+        <field name="Inherit Velocity" type="float" range="#F0_1#">How much of the air field velocity will be added to the particle velocity.</field>
+        <field name="Inherit Rotation" type="bool" />
+        <field name="Component Only" type="bool" />
+        <field name="Enable Spread" type="bool" />
+        <field name="Spread" type="float" range="#F0_1#">The angle of the air field cone if Enable Spread is true.</field>
     </niobject>
     
     <niobject name="NiPSysTrailEmitter" inherit="NiPSysSphereEmitter" module="NiCustom">
         Guild 2-Specific node
-        <add name="Trail Life Span" type="float" />
-        <add name="Trail Life Span Var" type="float" />
-        <add name="Num Trails" type="int" />
-        <add name="Gravity Force" type="float" />
-        <add name="Gravity Dir" type="Vector3" />
-        <add name="Turbulence" type="float" />
-        <add name="Repeat Time" type="float" />
+        <field name="Trail Life Span" type="float" />
+        <field name="Trail Life Span Var" type="float" />
+        <field name="Num Trails" type="int" />
+        <field name="Gravity Force" type="float" />
+        <field name="Gravity Dir" type="Vector3" />
+        <field name="Turbulence" type="float" />
+        <field name="Repeat Time" type="float" />
     </niobject>
 
     <niobject name="NiLightIntensityController" inherit="NiFloatInterpController" module="NiAnimation">
@@ -4929,7 +4929,7 @@
 
     <niobject name="NiPSysRadialFieldModifier" inherit="NiPSysFieldModifier" module="NiParticle">
         Particle system modifier, updates the particle velocity to simulate the effects of point gravity.
-        <add name="Radial Type" type="float">If zero, no attenuation.</add>
+        <field name="Radial Type" type="float">If zero, no attenuation.</field>
     </niobject>
 
     <niobject name="NiLODData" abstract="true" inherit="NiObject" module="NiMain">
@@ -4938,17 +4938,17 @@
 
     <niobject name="NiRangeLODData" inherit="NiLODData" module="NiMain">
         NiRangeLODData controls switching LOD levels based on Z depth from the camera to the NiLODNode.
-        <add name="LOD Center" type="Vector3" />
-        <add name="Num LOD Levels" type="uint" />
-        <add name="LOD Levels" type="LODRange" arr1="Num LOD Levels" />
+        <field name="LOD Center" type="Vector3" />
+        <field name="Num LOD Levels" type="uint" />
+        <field name="LOD Levels" type="LODRange" arr1="Num LOD Levels" />
     </niobject>
 
     <niobject name="NiScreenLODData" inherit="NiLODData" module="NiMain">
         NiScreenLODData controls switching LOD levels based on proportion of the screen that a bound would include.
-        <add name="Bounding Sphere" type="NiBound" />
-        <add name="World Bounding Sphere" type="NiBound" />
-        <add name="Num Proportions" type="uint" />
-        <add name="Proportion Levels" type="float" arr1="Num Proportions" />
+        <field name="Bounding Sphere" type="NiBound" />
+        <field name="World Bounding Sphere" type="NiBound" />
+        <field name="Num Proportions" type="uint" />
+        <field name="Proportion Levels" type="float" arr1="Num Proportions" />
     </niobject>
 
     <niobject name="NiRotatingParticles" inherit="NiParticles" module="NiLegacy" until="V10_0_1_0">
@@ -4962,43 +4962,43 @@
 
     <niobject name="NiShadeProperty" inherit="NiProperty" module="NiMain">
         Determines whether flat shading or smooth shading is used on a shape.
-        <add name="Flags" type="ShadeFlags" default="SHADING_SMOOTH" vercond="#NI_BS_LTE_FO3#" />
+        <field name="Flags" type="ShadeFlags" default="SHADING_SMOOTH" vercond="#NI_BS_LTE_FO3#" />
     </niobject>
 
     <niobject name="NiSkinData" inherit="NiObject" module="NiMain">
         Skinning data.
-        <add name="Skin Transform" type="NiTransform">Offset of the skin from this bone in bind position.</add>
-        <add name="Num Bones" type="uint">Number of bones.</add>
-        <add name="Skin Partition" type="Ref" template="NiSkinPartition" ver1="4.0.0.2" ver2="10.1.0.0">This optionally links a NiSkinPartition for hardware-acceleration information.</add>
-        <add name="Has Vertex Weights" type="byte" ver1="4.2.1.0" default="1">Enables Vertex Weights for this NiSkinData.</add>
-        <add name="Bone List" type="BoneData" arr1="Num Bones" arg="Has Vertex Weights">Contains offset data for each node that this skin is influenced by.</add>
+        <field name="Skin Transform" type="NiTransform">Offset of the skin from this bone in bind position.</field>
+        <field name="Num Bones" type="uint">Number of bones.</field>
+        <field name="Skin Partition" type="Ref" template="NiSkinPartition" ver1="4.0.0.2" ver2="10.1.0.0">This optionally links a NiSkinPartition for hardware-acceleration information.</field>
+        <field name="Has Vertex Weights" type="byte" ver1="4.2.1.0" default="1">Enables Vertex Weights for this NiSkinData.</field>
+        <field name="Bone List" type="BoneData" arr1="Num Bones" arg="Has Vertex Weights">Contains offset data for each node that this skin is influenced by.</field>
     </niobject>
 
     <niobject name="NiSkinInstance" inherit="NiObject" module="NiMain">
         Skinning instance.
-        <add name="Data" type="Ref" template="NiSkinData">Skinning data reference.</add>
-        <add name="Skin Partition" type="Ref" template="NiSkinPartition" ver1="10.1.0.101">Refers to a NiSkinPartition objects, which partitions the mesh such that every vertex is only influenced by a limited number of bones.</add>
-        <add name="Skeleton Root" type="Ptr" template="NiNode">Armature root node.</add>
-        <add name="Num Bones" type="uint">The number of node bones referenced as influences.</add>
-        <add name="Bones" type="Ptr" template="NiNode" arr1="Num Bones">List of all armature bones.</add>
+        <field name="Data" type="Ref" template="NiSkinData">Skinning data reference.</field>
+        <field name="Skin Partition" type="Ref" template="NiSkinPartition" ver1="10.1.0.101">Refers to a NiSkinPartition objects, which partitions the mesh such that every vertex is only influenced by a limited number of bones.</field>
+        <field name="Skeleton Root" type="Ptr" template="NiNode">Armature root node.</field>
+        <field name="Num Bones" type="uint">The number of node bones referenced as influences.</field>
+        <field name="Bones" type="Ptr" template="NiNode" arr1="Num Bones">List of all armature bones.</field>
     </niobject>
 
     <niobject name="NiTriShapeSkinController" inherit="NiTimeController" module="NiLegacy" until="V10_0_1_0">
         Old version of skinning instance.
-        <add name="Num Bones" type="uint">The number of node bones referenced as influences.</add>
-        <add name="Vertex Counts" type="uint" arr1="Num Bones">The number of vertex weights stored for each bone.</add>
-        <add name="Bones" type="Ptr" template="NiBone" arr1="Num Bones">List of all armature bones.</add>
-        <add name="Bone Data" type="OldSkinData" arr1="Num Bones" arr2="Vertex Counts">Contains skin weight data for each node that this skin is influenced by.</add>
+        <field name="Num Bones" type="uint">The number of node bones referenced as influences.</field>
+        <field name="Vertex Counts" type="uint" arr1="Num Bones">The number of vertex weights stored for each bone.</field>
+        <field name="Bones" type="Ptr" template="NiBone" arr1="Num Bones">List of all armature bones.</field>
+        <field name="Bone Data" type="OldSkinData" arr1="Num Bones" arr2="Vertex Counts">Contains skin weight data for each node that this skin is influenced by.</field>
     </niobject>
 
     <niobject name="NiSkinPartition" inherit="NiObject" module="NiMain">
         Skinning data, optimized for hardware skinning. The mesh is partitioned in submeshes such that each vertex of a submesh is influenced only by a limited and fixed number of bones.
-        <add name="Num Partitions" type="uint" />
-		<add name="Data Size" type="uint" calc="#LEN[Vertex Data]# #MUL# Vertex Size" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
-		<add name="Vertex Size" type="uint" calc="(Vertex Desc #BITAND# 0xF) #MUL# 4" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
-		<add name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
-		<add name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc #RSH# 44" arr1="Data Size / Vertex Size" cond="Data Size #GT# 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
-		<add name="Partitions" type="SkinPartition" arr1="Num Partitions" />
+        <field name="Num Partitions" type="uint" />
+		<field name="Data Size" type="uint" calc="#LEN[Vertex Data]# #MUL# Vertex Size" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<field name="Vertex Size" type="uint" calc="(Vertex Desc #BITAND# 0xF) #MUL# 4" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<field name="Vertex Desc" type="BSVertexDesc" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<field name="Vertex Data" type="BSVertexDataSSE" arg="Vertex Desc #RSH# 44" arr1="Data Size / Vertex Size" cond="Data Size #GT# 0" ver1="20.2.0.7" ver2="20.2.0.7" vercond="#BS_SSE#" />
+		<field name="Partitions" type="SkinPartition" arr1="Num Partitions" />
     </niobject>
 
     <niobject name="NiTexture" abstract="true" inherit="NiObjectNET" module="NiMain">
@@ -5007,167 +5007,167 @@
 
     <compound name="FormatPrefs" size="12">
         NiTexture::FormatPrefs. These preferences are a request to the renderer to use a format the most closely matches the settings and may be ignored.
-        <add name="Pixel Layout" type="PixelLayout">Requests the way the image will be stored.</add>
-        <add name="Use Mipmaps" type="MipMapFormat" default="MIP_FMT_DEFAULT">Requests if mipmaps are used or not.</add>
-        <add name="Alpha Format" type="AlphaFormat" default="ALPHA_DEFAULT">Requests no alpha, 1-bit alpha, or </add>
+        <field name="Pixel Layout" type="PixelLayout">Requests the way the image will be stored.</field>
+        <field name="Use Mipmaps" type="MipMapFormat" default="MIP_FMT_DEFAULT">Requests if mipmaps are used or not.</field>
+        <field name="Alpha Format" type="AlphaFormat" default="ALPHA_DEFAULT">Requests no alpha, 1-bit alpha, or </field>
     </compound>
 
     <niobject name="NiSourceTexture" inherit="NiTexture" module="NiMain">
         Describes texture source and properties.
-        <add name="Use External" type="byte" default="1">Is the texture external?</add>
-        <add name="Use Internal" type="byte" default="1" cond="Use External == 0" ver2="10.0.1.3" />
-        <add name="File Name" type="FilePath" cond="Use External == 1">The external texture file name.</add>
-        <add name="File Name" type="FilePath" cond="Use External == 0" ver1="10.1.0.0">The original source filename of the image embedded by the referred NiPixelData object.</add>
-        <add name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 1" ver1="10.1.0.0" />
-        <add name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 0 #AND# Use Internal == 1" ver2="10.0.1.3">NiPixelData or NiPersistentSrcTextureRendererData</add>
-        <add name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 0" ver1="10.0.1.4">NiPixelData or NiPersistentSrcTextureRendererData</add>
-        <add name="Format Prefs" type="FormatPrefs">A set of preferences for the texture format. They are a request only and the renderer may ignore them.</add>
-        <add name="Is Static" type="byte" default="1">If set, then the application cannot assume that any dynamic changes to the pixel data will show in the rendered image.</add>
-        <add name="Direct Render" type="bool" default="1" ver1="10.1.0.103">A hint to the renderer that the texture can be loaded directly from a texture file into a renderer-specific resource, bypassing the NiPixelData object.</add>
-        <add name="Persist Render Data" type="bool" default="0" ver1="20.2.0.4">Pixel Data is NiPersistentSrcTextureRendererData instead of NiPixelData.</add>
+        <field name="Use External" type="byte" default="1">Is the texture external?</field>
+        <field name="Use Internal" type="byte" default="1" cond="Use External == 0" ver2="10.0.1.3" />
+        <field name="File Name" type="FilePath" cond="Use External == 1">The external texture file name.</field>
+        <field name="File Name" type="FilePath" cond="Use External == 0" ver1="10.1.0.0">The original source filename of the image embedded by the referred NiPixelData object.</field>
+        <field name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 1" ver1="10.1.0.0" />
+        <field name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 0 #AND# Use Internal == 1" ver2="10.0.1.3">NiPixelData or NiPersistentSrcTextureRendererData</field>
+        <field name="Pixel Data" type="Ref" template="NiPixelFormat" cond="Use External == 0" ver1="10.0.1.4">NiPixelData or NiPersistentSrcTextureRendererData</field>
+        <field name="Format Prefs" type="FormatPrefs">A set of preferences for the texture format. They are a request only and the renderer may ignore them.</field>
+        <field name="Is Static" type="byte" default="1">If set, then the application cannot assume that any dynamic changes to the pixel data will show in the rendered image.</field>
+        <field name="Direct Render" type="bool" default="1" ver1="10.1.0.103">A hint to the renderer that the texture can be loaded directly from a texture file into a renderer-specific resource, bypassing the NiPixelData object.</field>
+        <field name="Persist Render Data" type="bool" default="0" ver1="20.2.0.4">Pixel Data is NiPersistentSrcTextureRendererData instead of NiPixelData.</field>
     </niobject>
 
     <niobject name="NiSpecularProperty" inherit="NiProperty" module="NiMain">
         Gives specularity to a shape. Flags 0x0001.
-        <add name="Flags" type="SpecularFlags" />
+        <field name="Flags" type="SpecularFlags" />
     </niobject>
 
     <niobject name="NiSphericalCollider" inherit="NiParticleCollider" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1) particle modifier.
-        <add name="Radius" type="float" />
-        <add name="Position" type="Vector3" />
+        <field name="Radius" type="float" />
+        <field name="Position" type="Vector3" />
     </niobject>
 
     <niobject name="NiSpotLight" inherit="NiPointLight" module="NiMain">
         A spot.
-        <add name="Outer Spot Angle" type="float" range="#F_DEG#" />
-        <add name="Inner Spot Angle" type="float" range="#F_DEG#" ver1="20.2.0.5" />
-        <add name="Exponent" type="float" default="1.0">Describes the distribution of light.</add>
+        <field name="Outer Spot Angle" type="float" range="#F_DEG#" />
+        <field name="Inner Spot Angle" type="float" range="#F_DEG#" ver1="20.2.0.5" />
+        <field name="Exponent" type="float" default="1.0">Describes the distribution of light.</field>
     </niobject>
 
     <niobject name="NiStencilProperty" inherit="NiProperty" module="NiMain">
         Allows control of stencil testing.
-        <add name="Flags" type="ushort" ver2="10.0.1.2">Property flags.</add>
-        <add name="Stencil Enabled" type="byte" ver2="20.0.0.5">Enables or disables the stencil test.</add>
-        <add name="Stencil Function" type="StencilTestFunc" ver2="20.0.0.5">Selects the compare mode function.</add>
-        <add name="Stencil Ref" type="uint" ver2="20.0.0.5" />
-        <add name="Stencil Mask" type="uint" default="#UINT_MAX#" ver2="20.0.0.5">A bit mask. The default is 0xffffffff.</add>
-        <add name="Fail Action" type="StencilAction" ver2="20.0.0.5" />
-        <add name="Z Fail Action" type="StencilAction" ver2="20.0.0.5" />
-        <add name="Pass Action" type="StencilAction" ver2="20.0.0.5" />
-        <add name="Draw Mode" default="DRAW_BOTH" type="StencilDrawMode" ver2="20.0.0.5">Used to enabled double sided faces. Default is 3 (DRAW_BOTH).</add>
-        <add name="Flags" type="StencilFlags" default="19840" ver1="20.1.0.3" />
-        <add name="Stencil Ref" type="uint" ver1="20.1.0.3" />
-        <add name="Stencil Mask" type="uint" default="#UINT_MAX#" ver1="20.1.0.3">A bit mask. The default is 0xffffffff.</add>
+        <field name="Flags" type="ushort" ver2="10.0.1.2">Property flags.</field>
+        <field name="Stencil Enabled" type="byte" ver2="20.0.0.5">Enables or disables the stencil test.</field>
+        <field name="Stencil Function" type="StencilTestFunc" ver2="20.0.0.5">Selects the compare mode function.</field>
+        <field name="Stencil Ref" type="uint" ver2="20.0.0.5" />
+        <field name="Stencil Mask" type="uint" default="#UINT_MAX#" ver2="20.0.0.5">A bit mask. The default is 0xffffffff.</field>
+        <field name="Fail Action" type="StencilAction" ver2="20.0.0.5" />
+        <field name="Z Fail Action" type="StencilAction" ver2="20.0.0.5" />
+        <field name="Pass Action" type="StencilAction" ver2="20.0.0.5" />
+        <field name="Draw Mode" default="DRAW_BOTH" type="StencilDrawMode" ver2="20.0.0.5">Used to enabled double sided faces. Default is 3 (DRAW_BOTH).</field>
+        <field name="Flags" type="StencilFlags" default="19840" ver1="20.1.0.3" />
+        <field name="Stencil Ref" type="uint" ver1="20.1.0.3" />
+        <field name="Stencil Mask" type="uint" default="#UINT_MAX#" ver1="20.1.0.3">A bit mask. The default is 0xffffffff.</field>
     </niobject>
 
     <niobject name="NiStringExtraData" inherit="NiExtraData" module="NiMain">
         Extra data in the form of text.
         Used in various official or user-defined ways, e.g. preventing optimization on objects ("NiOptimizeKeep", "sgoKeep").
-        <add name="String Data" type="string" ver1="4.0.0.0">The string.</add>
+        <field name="String Data" type="string" ver1="4.0.0.0">The string.</field>
     </niobject>
 
     <niobject name="NiStringPalette" inherit="NiObject" module="NiMain">
         List of 0x00-seperated strings, which are names of controlled objects and controller types. Used in .kf files in conjunction with NiControllerSequence.
-        <add name="Palette" type="StringPalette">A bunch of 0x00 seperated strings.</add>
+        <field name="Palette" type="StringPalette">A bunch of 0x00 seperated strings.</field>
     </niobject>
 
     <niobject name="NiStringsExtraData" inherit="NiExtraData" module="NiMain">
         Extra data in the form of a list of strings.
-        <add name="Num Strings" type="uint" default="1">Number of strings.</add>
-        <add name="Data" type="SizedString" arr1="Num Strings">The strings.</add>
+        <field name="Num Strings" type="uint" default="1">Number of strings.</field>
+        <field name="Data" type="SizedString" arr1="Num Strings">The strings.</field>
     </niobject>
 
     <niobject name="NiTextKeyExtraData" inherit="NiExtraData" module="NiMain">
         Extra data that holds an array of NiTextKey objects for use in animation sequences.
-        <add name="Num Text Keys" type="uint">The number of text keys that follow.</add>
-        <add name="Text Keys" type="Key" arg="1" template="string" arr1="Num Text Keys">List of textual notes and at which time they take effect. Used for designating the start and stop of animations and the triggering of sounds.</add>
+        <field name="Num Text Keys" type="uint">The number of text keys that follow.</field>
+        <field name="Text Keys" type="Key" arg="1" template="string" arr1="Num Text Keys">List of textual notes and at which time they take effect. Used for designating the start and stop of animations and the triggering of sounds.</field>
     </niobject>
 
     <niobject name="NiTextureEffect" inherit="NiDynamicEffect" module="NiMain">
         Represents an effect that uses projected textures such as projected lights (gobos), environment maps, and fog maps.
-        <add name="Model Projection Matrix" type="Matrix33">Model projection matrix.  Always identity?</add>
-        <add name="Model Projection Translation" type="Vector3">Model projection translation.  Always (0,0,0)?</add>
-        <add name="Texture Filtering" type="TexFilterMode" default="FILTER_TRILERP">Texture Filtering mode.</add>
-        <add name="Max Anisotropy" type="ushort" ver1="20.5.0.4" />
-        <add name="Texture Clamping" type="TexClampMode" default="WRAP_S_WRAP_T">Texture Clamp mode.</add>
-        <add name="Texture Type" default="TEX_ENVIRONMENT_MAP" type="TextureType">The type of effect that the texture is used for.</add>
-        <add name="Coordinate Generation Type" default="CG_SPHERE_MAP" type="CoordGenType">The method that will be used to generate UV coordinates for the texture effect.</add>
-        <add name="Image" type="Ref" template="NiImage" ver2="3.1">Image index.</add>
-        <add name="Source Texture" type="Ref" template="NiSourceTexture" ver1="3.1">Source texture index.</add>
-        <add name="Enable Plane" default="0" type="byte">Determines whether a clipping plane is used. Always 8-bit.</add>
-        <add name="Plane" type="NiPlane" />
-        <add name="PS2 L" type="short" default="0" ver2="10.2.0.0" />
-        <add name="PS2 K" type="short" default="-75" ver2="10.2.0.0" />
-        <add name="Unknown Short" type="ushort" ver2="4.1.0.12" default="0" />
+        <field name="Model Projection Matrix" type="Matrix33">Model projection matrix.  Always identity?</field>
+        <field name="Model Projection Translation" type="Vector3">Model projection translation.  Always (0,0,0)?</field>
+        <field name="Texture Filtering" type="TexFilterMode" default="FILTER_TRILERP">Texture Filtering mode.</field>
+        <field name="Max Anisotropy" type="ushort" ver1="20.5.0.4" />
+        <field name="Texture Clamping" type="TexClampMode" default="WRAP_S_WRAP_T">Texture Clamp mode.</field>
+        <field name="Texture Type" default="TEX_ENVIRONMENT_MAP" type="TextureType">The type of effect that the texture is used for.</field>
+        <field name="Coordinate Generation Type" default="CG_SPHERE_MAP" type="CoordGenType">The method that will be used to generate UV coordinates for the texture effect.</field>
+        <field name="Image" type="Ref" template="NiImage" ver2="3.1">Image index.</field>
+        <field name="Source Texture" type="Ref" template="NiSourceTexture" ver1="3.1">Source texture index.</field>
+        <field name="Enable Plane" default="0" type="byte">Determines whether a clipping plane is used. Always 8-bit.</field>
+        <field name="Plane" type="NiPlane" />
+        <field name="PS2 L" type="short" default="0" ver2="10.2.0.0" />
+        <field name="PS2 K" type="short" default="-75" ver2="10.2.0.0" />
+        <field name="Unknown Short" type="ushort" ver2="4.1.0.12" default="0" />
     </niobject>
 
     <niobject name="NiTextureModeProperty" inherit="NiProperty" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1)
-        <add name="Unknown Ints" type="uint" arr1="3" ver2="2.3" />
-        <add name="Flags" type="ushort" ver1="3.0">Either 210 or 194.</add>
-        <add name="PS2 L" type="short" default="0" ver1="3.1" ver2="10.2.0.0" />
-        <add name="PS2 K" type="short" default="-75" ver1="3.1" ver2="10.2.0.0" />
+        <field name="Unknown Ints" type="uint" arr1="3" ver2="2.3" />
+        <field name="Flags" type="ushort" ver1="3.0">Either 210 or 194.</field>
+        <field name="PS2 L" type="short" default="0" ver1="3.1" ver2="10.2.0.0" />
+        <field name="PS2 K" type="short" default="-75" ver1="3.1" ver2="10.2.0.0" />
     </niobject>
 
     <niobject name="NiImage" inherit="NiObject" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1)
-        <add name="Use External" type="byte">0 if the texture is internal to the NIF file.</add>
-        <add name="File Name" type="FilePath" cond="Use External != 0">The filepath to the texture.</add>
-        <add name="Image Data" type="Ref" template="NiRawImageData" cond="Use External == 0">Link to the internally stored image data.</add>
-        <add name="Unknown Int" type="uint" default="7" />
-        <add name="Unknown Float" type="float" ver1="3.1" default="128.5" />
+        <field name="Use External" type="byte">0 if the texture is internal to the NIF file.</field>
+        <field name="File Name" type="FilePath" cond="Use External != 0">The filepath to the texture.</field>
+        <field name="Image Data" type="Ref" template="NiRawImageData" cond="Use External == 0">Link to the internally stored image data.</field>
+        <field name="Unknown Int" type="uint" default="7" />
+        <field name="Unknown Float" type="float" ver1="3.1" default="128.5" />
     </niobject>
 
     <niobject name="NiTextureProperty" inherit="NiProperty" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1)
-        <add name="Unknown Ints 1" type="uint" arr1="2" ver2="2.3" />
-        <add name="Flags" type="ushort" ver1="3.0">Property flags.</add>
-        <add name="Image" type="Ref" template="NiImage">Link to the texture image.</add>
-        <add name="Unknown Ints 2" type="uint" arr1="2" ver1="3.0" ver2="3.03" />
+        <field name="Unknown Ints 1" type="uint" arr1="2" ver2="2.3" />
+        <field name="Flags" type="ushort" ver1="3.0">Property flags.</field>
+        <field name="Image" type="Ref" template="NiImage">Link to the texture image.</field>
+        <field name="Unknown Ints 2" type="uint" arr1="2" ver1="3.0" ver2="3.03" />
     </niobject>
 
     <niobject name="NiTexturingProperty" inherit="NiProperty" module="NiMain">
         Describes how a fragment shader should be configured for a given piece of geometry.
-        <add name="Flags" type="ushort" ver2="10.0.1.2">Property flags.</add>
-        <add name="Flags" type="TexturingFlags" ver1="20.1.0.2">Property flags.</add>
-        <add name="Apply Mode" type="ApplyMode" default="APPLY_MODULATE" ver1="3.3.0.13" ver2="20.1.0.1">Determines how the texture will be applied.  Seems to have special functions in Oblivion.</add>
-        <add name="Texture Count" type="uint" default="7">Number of textures.</add>
-        <add name="Has Base Texture" type="bool" />
-        <add name="Base Texture" type="TexDesc" cond="Has Base Texture" />
-        <add name="Has Dark Texture" type="bool" />
-        <add name="Dark Texture" type="TexDesc" cond="Has Dark Texture" />
-        <add name="Has Detail Texture" type="bool" />
-        <add name="Detail Texture" type="TexDesc" cond="Has Detail Texture" />
-        <add name="Has Gloss Texture" type="bool" />
-        <add name="Gloss Texture" type="TexDesc" cond="Has Gloss Texture" />
-        <add name="Has Glow Texture" type="bool" />
-        <add name="Glow Texture" type="TexDesc" cond="Has Glow Texture" />
-        <add name="Has Bump Map Texture" type="bool" ver1="3.3.0.13" cond="Texture Count #GT# 5" />
-        <add name="Bump Map Texture" type="TexDesc" ver1="3.3.0.13" cond="Has Bump Map Texture" />
-        <add name="Bump Map Luma Scale" type="float" ver1="3.3.0.13" cond="Has Bump Map Texture" />
-        <add name="Bump Map Luma Offset" type="float" ver1="3.3.0.13" cond="Has Bump Map Texture" />
-        <add name="Bump Map Matrix" type="Matrix22" ver1="3.3.0.13" cond="Has Bump Map Texture" />
-        <add name="Has Normal Texture" type="bool" cond="Texture Count #GT# 6" ver1="20.2.0.5" />
-        <add name="Normal Texture" type="TexDesc" cond="Has Normal Texture" ver1="20.2.0.5" />
-        <add name="Has Parallax Texture" type="bool" cond="Texture Count #GT# 7" ver1="20.2.0.5" />
-        <add name="Parallax Texture" type="TexDesc" cond="Has Parallax Texture" ver1="20.2.0.5" />
-        <add name="Parallax Offset" type="float" cond="Has Parallax Texture" ver1="20.2.0.5" />
-        <add name="Has Decal 0 Texture" type="bool" cond="Texture Count #GT# 6" ver2="20.2.0.4" />
-        <add name="Has Decal 0 Texture" type="bool" cond="Texture Count #GT# 8" ver1="20.2.0.5" />
-        <add name="Decal 0 Texture" type="TexDesc" cond="Has Decal 0 Texture" />
-        <add name="Has Decal 1 Texture" type="bool" cond="Texture Count #GT# 7" ver2="20.2.0.4" />
-        <add name="Has Decal 1 Texture" type="bool" cond="Texture Count #GT# 9" ver1="20.2.0.5" />
-        <add name="Decal 1 Texture" type="TexDesc" cond="Has Decal 1 Texture" />
-        <add name="Has Decal 2 Texture" type="bool" cond="Texture Count #GT# 8" ver2="20.2.0.4" />
-        <add name="Has Decal 2 Texture" type="bool" cond="Texture Count #GT# 10" ver1="20.2.0.5" />
-        <add name="Decal 2 Texture" type="TexDesc" cond="Has Decal 2 Texture" />
-        <add name="Has Decal 3 Texture" type="bool" cond="Texture Count #GT# 9" ver2="20.2.0.4" />
-        <add name="Has Decal 3 Texture" type="bool" cond="Texture Count #GT# 11" ver1="20.2.0.5" />
-        <add name="Decal 3 Texture" type="TexDesc" cond="Has Decal 3 Texture" />
+        <field name="Flags" type="ushort" ver2="10.0.1.2">Property flags.</field>
+        <field name="Flags" type="TexturingFlags" ver1="20.1.0.2">Property flags.</field>
+        <field name="Apply Mode" type="ApplyMode" default="APPLY_MODULATE" ver1="3.3.0.13" ver2="20.1.0.1">Determines how the texture will be applied.  Seems to have special functions in Oblivion.</field>
+        <field name="Texture Count" type="uint" default="7">Number of textures.</field>
+        <field name="Has Base Texture" type="bool" />
+        <field name="Base Texture" type="TexDesc" cond="Has Base Texture" />
+        <field name="Has Dark Texture" type="bool" />
+        <field name="Dark Texture" type="TexDesc" cond="Has Dark Texture" />
+        <field name="Has Detail Texture" type="bool" />
+        <field name="Detail Texture" type="TexDesc" cond="Has Detail Texture" />
+        <field name="Has Gloss Texture" type="bool" />
+        <field name="Gloss Texture" type="TexDesc" cond="Has Gloss Texture" />
+        <field name="Has Glow Texture" type="bool" />
+        <field name="Glow Texture" type="TexDesc" cond="Has Glow Texture" />
+        <field name="Has Bump Map Texture" type="bool" ver1="3.3.0.13" cond="Texture Count #GT# 5" />
+        <field name="Bump Map Texture" type="TexDesc" ver1="3.3.0.13" cond="Has Bump Map Texture" />
+        <field name="Bump Map Luma Scale" type="float" ver1="3.3.0.13" cond="Has Bump Map Texture" />
+        <field name="Bump Map Luma Offset" type="float" ver1="3.3.0.13" cond="Has Bump Map Texture" />
+        <field name="Bump Map Matrix" type="Matrix22" ver1="3.3.0.13" cond="Has Bump Map Texture" />
+        <field name="Has Normal Texture" type="bool" cond="Texture Count #GT# 6" ver1="20.2.0.5" />
+        <field name="Normal Texture" type="TexDesc" cond="Has Normal Texture" ver1="20.2.0.5" />
+        <field name="Has Parallax Texture" type="bool" cond="Texture Count #GT# 7" ver1="20.2.0.5" />
+        <field name="Parallax Texture" type="TexDesc" cond="Has Parallax Texture" ver1="20.2.0.5" />
+        <field name="Parallax Offset" type="float" cond="Has Parallax Texture" ver1="20.2.0.5" />
+        <field name="Has Decal 0 Texture" type="bool" cond="Texture Count #GT# 6" ver2="20.2.0.4" />
+        <field name="Has Decal 0 Texture" type="bool" cond="Texture Count #GT# 8" ver1="20.2.0.5" />
+        <field name="Decal 0 Texture" type="TexDesc" cond="Has Decal 0 Texture" />
+        <field name="Has Decal 1 Texture" type="bool" cond="Texture Count #GT# 7" ver2="20.2.0.4" />
+        <field name="Has Decal 1 Texture" type="bool" cond="Texture Count #GT# 9" ver1="20.2.0.5" />
+        <field name="Decal 1 Texture" type="TexDesc" cond="Has Decal 1 Texture" />
+        <field name="Has Decal 2 Texture" type="bool" cond="Texture Count #GT# 8" ver2="20.2.0.4" />
+        <field name="Has Decal 2 Texture" type="bool" cond="Texture Count #GT# 10" ver1="20.2.0.5" />
+        <field name="Decal 2 Texture" type="TexDesc" cond="Has Decal 2 Texture" />
+        <field name="Has Decal 3 Texture" type="bool" cond="Texture Count #GT# 9" ver2="20.2.0.4" />
+        <field name="Has Decal 3 Texture" type="bool" cond="Texture Count #GT# 11" ver1="20.2.0.5" />
+        <field name="Decal 3 Texture" type="TexDesc" cond="Has Decal 3 Texture" />
         
-        <add name="Num Shader Textures" type="uint" ver1="10.0.1.0" />
-        <add name="Shader Textures" type="ShaderTexDesc" arr1="Num Shader Textures" ver1="10.0.1.0" />
+        <field name="Num Shader Textures" type="uint" ver1="10.0.1.0" />
+        <field name="Shader Textures" type="ShaderTexDesc" arr1="Num Shader Textures" ver1="10.0.1.0" />
     </niobject>
 
     <niobject name="NiMultiTextureProperty" inherit="NiTexturingProperty" module="NiLegacy" />
@@ -5182,12 +5182,12 @@
 
     <niobject name="NiTriShapeData" inherit="NiTriBasedGeomData" module="NiMain">
         Holds mesh data using a list of singular triangles.
-        <add name="Num Triangle Points" type="uint" range="0:196605">Num Triangles times 3.</add>
-        <add name="Has Triangles" type="bool" ver1="10.1.0.0">Do we have triangle data?</add>
-        <add name="Triangles" type="Triangle" arr1="Num Triangles" ver2="10.0.1.2">Triangle data.</add>
-        <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Has Triangles" ver1="10.0.1.3">Triangle face data.</add>
-        <add name="Num Match Groups" type="ushort" ver1="3.1">Number of shared normals groups.</add>
-        <add name="Match Groups" type="MatchGroup" arr1="Num Match Groups" ver1="3.1">The shared normals.</add>
+        <field name="Num Triangle Points" type="uint" range="0:196605">Num Triangles times 3.</field>
+        <field name="Has Triangles" type="bool" ver1="10.1.0.0">Do we have triangle data?</field>
+        <field name="Triangles" type="Triangle" arr1="Num Triangles" ver2="10.0.1.2">Triangle data.</field>
+        <field name="Triangles" type="Triangle" arr1="Num Triangles" cond="Has Triangles" ver1="10.0.1.3">Triangle face data.</field>
+        <field name="Num Match Groups" type="ushort" ver1="3.1">Number of shared normals groups.</field>
+        <field name="Match Groups" type="MatchGroup" arr1="Num Match Groups" ver1="3.1">The shared normals.</field>
     </niobject>
 
     <niobject name="NiTriStrips" inherit="NiTriBasedGeom" module="NiMain">
@@ -5196,21 +5196,21 @@
 
     <niobject name="NiTriStripsData" inherit="NiTriBasedGeomData" module="NiMain">
         Holds mesh data using strips of triangles.
-        <add name="Num Strips" type="ushort" default="1" />
-        <add name="Strip Lengths" type="ushort" arr1="Num Strips">The number of points in each triangle strip.</add>
-        <add name="Has Points" type="bool" default="1" ver1="10.0.1.3">Do we have strip point data?</add>
-        <add name="Points" type="ushort" arr1="Num Strips" arr2="Strip Lengths" ver2="10.0.1.2">The points in the Triangle strips.  Size is the sum of all entries in Strip Lengths.</add>
-        <add name="Points" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="Has Points" ver1="10.0.1.3">The points in the Triangle strips. Size is the sum of all entries in Strip Lengths.</add>
+        <field name="Num Strips" type="ushort" default="1" />
+        <field name="Strip Lengths" type="ushort" arr1="Num Strips">The number of points in each triangle strip.</field>
+        <field name="Has Points" type="bool" default="1" ver1="10.0.1.3">Do we have strip point data?</field>
+        <field name="Points" type="ushort" arr1="Num Strips" arr2="Strip Lengths" ver2="10.0.1.2">The points in the Triangle strips.  Size is the sum of all entries in Strip Lengths.</field>
+        <field name="Points" type="ushort" arr1="Num Strips" arr2="Strip Lengths" cond="Has Points" ver1="10.0.1.3">The points in the Triangle strips. Size is the sum of all entries in Strip Lengths.</field>
     </niobject>
 
     <niobject name="NiEnvMappedTriShape" inherit="NiObjectNET" module="NiLegacy" until="V10_0_1_0">
         Unknown
-        <add name="Unknown 1" type="ushort" />
-        <add name="Unknown Matrix" type="Matrix44" />
-        <add name="Num Children" type="uint">The number of child objects.</add>
-        <add name="Children" type="Ref" template="NiAVObject" arr1="Num Children">List of child node object indices.</add>
-        <add name="Child 2" type="Ref" template="NiObject" />
-        <add name="Child 3" type="Ref" template="NiObject" />
+        <field name="Unknown 1" type="ushort" />
+        <field name="Unknown Matrix" type="Matrix44" />
+        <field name="Num Children" type="uint">The number of child objects.</field>
+        <field name="Children" type="Ref" template="NiAVObject" arr1="Num Children">List of child node object indices.</field>
+        <field name="Child 2" type="Ref" template="NiObject" />
+        <field name="Child 3" type="Ref" template="NiObject" />
     </niobject>
 
     <niobject name="NiEnvMappedTriShapeData" inherit="NiTriShapeData" module="NiLegacy" until="V10_0_1_0">
@@ -5220,31 +5220,31 @@
     <niobject name="NiBezierTriangle4" inherit="NiObject" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1)
         Sub data of NiBezierMesh
-        <add name="Unknown 1" type="uint" arr1="6" />
-        <add name="Unknown 2" type="ushort" />
-        <add name="Matrix" type="Matrix33" />
-        <add name="Vector 1" type="Vector3" />
-        <add name="Vector 2" type="Vector3" />
-        <add name="Unknown 3" type="short" arr1="4" />
-        <add name="Unknown 4" type="byte" />
-        <add name="Unknown 5" type="uint" />
-        <add name="Unknown 6" type="short" arr1="24" />
+        <field name="Unknown 1" type="uint" arr1="6" />
+        <field name="Unknown 2" type="ushort" />
+        <field name="Matrix" type="Matrix33" />
+        <field name="Vector 1" type="Vector3" />
+        <field name="Vector 2" type="Vector3" />
+        <field name="Unknown 3" type="short" arr1="4" />
+        <field name="Unknown 4" type="byte" />
+        <field name="Unknown 5" type="uint" />
+        <field name="Unknown 6" type="short" arr1="24" />
     </niobject>
 
     <niobject name="NiBezierMesh" inherit="NiAVObject" module="NiLegacy" until="V10_0_1_0">
         LEGACY (pre-10.1)
         Unknown
-        <add name="Num Bezier Triangles" type="uint" />
-        <add name="Bezier Triangle" type="Ref" template="NiBezierTriangle4" arr1="Num Bezier Triangles" />
-        <add name="Unknown 3" type="uint" />
-        <add name="Count 1" type="ushort" />
-        <add name="Unknown 4" type="ushort" />
-        <add name="Points 1" type="Vector3" arr1="Count 1" />
-        <add name="Unknown 5" type="uint" />
-        <add name="Points 2" type="float" arr1="Count 1" arr2="2" />
-        <add name="Unknown 6" type="uint" />
-        <add name="Count 2" type="ushort" />
-        <add name="Data 2" type="ushort" arr1="Count 2" arr2="4" />
+        <field name="Num Bezier Triangles" type="uint" />
+        <field name="Bezier Triangle" type="Ref" template="NiBezierTriangle4" arr1="Num Bezier Triangles" />
+        <field name="Unknown 3" type="uint" />
+        <field name="Count 1" type="ushort" />
+        <field name="Unknown 4" type="ushort" />
+        <field name="Points 1" type="Vector3" arr1="Count 1" />
+        <field name="Unknown 5" type="uint" />
+        <field name="Points 2" type="float" arr1="Count 1" arr2="2" />
+        <field name="Unknown 6" type="uint" />
+        <field name="Count 2" type="ushort" />
+        <field name="Data 2" type="ushort" arr1="Count 2" arr2="4" />
     </niobject>
 
     <niobject name="NiClod" inherit="NiTriBasedGeom" module="NiLegacy" until="V4_0_0_2">
@@ -5257,15 +5257,15 @@
         Holds mesh data for continuous level of detail shapes.
         Presumably a progressive mesh with triangles specified by edge splits.
         Found in: Freedom Force, Spellbinder
-        <add name="Unknown Shorts" type="ushort" />
-        <add name="Unknown Count 1" type ="ushort" />
-        <add name="Unknown Count 2" type ="ushort" />
-        <add name="Unknown Count 3" type ="ushort" />
-        <add name="Unknown Float" type="float" />
-        <add name="Unknown Short" type="ushort" />
-        <add name="Unknown Clod Shorts 1" type="ushort" arr1="Unknown Count 1" arr2="6" />
-        <add name="Unknown Clod Shorts 2" type="ushort" arr1="Unknown Count 2" />
-        <add name="Unknown Clod Shorts 3" type="ushort" arr1="Unknown Count 3" arr2="6" />
+        <field name="Unknown Shorts" type="ushort" />
+        <field name="Unknown Count 1" type ="ushort" />
+        <field name="Unknown Count 2" type ="ushort" />
+        <field name="Unknown Count 3" type ="ushort" />
+        <field name="Unknown Float" type="float" />
+        <field name="Unknown Short" type="ushort" />
+        <field name="Unknown Clod Shorts 1" type="ushort" arr1="Unknown Count 1" arr2="6" />
+        <field name="Unknown Clod Shorts 2" type="ushort" arr1="Unknown Count 2" />
+        <field name="Unknown Clod Shorts 3" type="ushort" arr1="Unknown Count 3" arr2="6" />
     </niobject>
 
     <niobject name="NiClodSkinInstance" inherit="NiSkinInstance" module="NiLegacy" until="V4_0_0_2">
@@ -5276,57 +5276,57 @@
     <niobject name="NiUVController" inherit="NiTimeController" module="NiAnimation" until="V20_2_0_8">
         DEPRECATED (pre-10.1), REMOVED (20.3).
         Time controller for texture coordinates.
-        <add name="Texture Set" type="ushort" />
-        <add name="Data" type="Ref" template="NiUVData">Texture coordinate controller data index.</add>
+        <field name="Texture Set" type="ushort" />
+        <field name="Data" type="Ref" template="NiUVData">Texture coordinate controller data index.</field>
     </niobject>
 
     <niobject name="NiUVData" inherit="NiObject" module="NiAnimation" until="V20_2_0_8">
         DEPRECATED (pre-10.1), REMOVED (20.3)
         Texture coordinate data.
-        <add name="UV Groups" type="KeyGroup" template="float" arr1="4">
+        <field name="UV Groups" type="KeyGroup" template="float" arr1="4">
             Four UV data groups. Appear to be U translation, V translation, U scaling/tiling, V scaling/tiling.
-        </add>
+        </field>
     </niobject>
 
     <niobject name="NiVectorExtraData" inherit="NiExtraData" module="NiMain">
         DEPRECATED (20.5).
         Extra data in the form of a vector (as x, y, z, w components).
-        <add name="Vector Data" type="Vector4">The vector data.</add>
+        <field name="Vector Data" type="Vector4">The vector data.</field>
     </niobject>
 
     <niobject name="NiVertexColorProperty" inherit="NiProperty" module="NiMain">
         Property of vertex colors. This object is referred to by the root object of the NIF file whenever some NiTriShapeData object has vertex colors with non-default settings; if not present, vertex colors have vertex_mode=2 and lighting_mode=1.
-        <add name="Flags" type="VertexColorFlags" />
-        <add name="Vertex Mode" type="SourceVertexMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</add>
-        <add name="Lighting Mode" type="LightingMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</add>
+        <field name="Flags" type="VertexColorFlags" />
+        <field name="Vertex Mode" type="SourceVertexMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</field>
+        <field name="Lighting Mode" type="LightingMode" ver2="20.0.0.5">In Flags from 20.1.0.3 on.</field>
     </niobject>
 
     <niobject name="NiVertWeightsExtraData" inherit="NiExtraData" module="NiMain">
         DEPRECATED (10.x), REMOVED (?)
         Not used in skinning.
         Unsure of use - perhaps for morphing animation or gravity.
-        <add name="Num Vertices" type="ushort">Number of vertices.</add>
-        <add name="Weight" type="float" arr1="Num Vertices">The vertex weights.</add>
+        <field name="Num Vertices" type="ushort">Number of vertices.</field>
+        <field name="Weight" type="float" arr1="Num Vertices">The vertex weights.</field>
     </niobject>
 
     <niobject name="NiVisData" inherit="NiObject" module="NiAnimation">
         DEPRECATED (10.2), REMOVED (?), Replaced by NiBoolData.
         Visibility data for a controller.
-        <add name="Num Keys" type="uint" />
-        <add name="Keys" type="Key" arg="1" template="byte" arr1="Num Keys" />
+        <field name="Num Keys" type="uint" />
+        <field name="Keys" type="Key" arg="1" template="byte" arr1="Num Keys" />
     </niobject>
 
     <niobject name="NiWireframeProperty" inherit="NiProperty" module="NiMain">
         Allows applications to switch between drawing solid geometry or wireframe outlines.
-        <add name="Flags" type="WireframeFlags" />
+        <field name="Flags" type="WireframeFlags" />
     </niobject>
 
     <niobject name="NiZBufferProperty" inherit="NiProperty" module="NiMain">
         Allows applications to set the test and write modes of the renderer's Z-buffer and to set the comparison function used for the Z-buffer test.
-        <add name="Flags" type="ZBufferFlags" default="3" />
-        <add name="Function" type="TestFunction" default="TEST_LESS_EQUAL" ver1="4.1.0.12" ver2="20.0.0.5">
+        <field name="Flags" type="ZBufferFlags" default="3" />
+        <field name="Function" type="TestFunction" default="TEST_LESS_EQUAL" ver1="4.1.0.12" ver2="20.0.0.5">
             Z-Test function. In Flags from 20.1.0.3 on.
-        </add>
+        </field>
     </niobject>
 
     <niobject name="RootCollisionNode" inherit="NiNode" module="BSLegacy" versions="V4_0_0_2">
@@ -5336,19 +5336,19 @@
     <niobject name="NiRawImageData" inherit="NiObject" module="NiLegacy" until="V3_1">
         LEGACY (pre-10.1)
         Raw image data.
-        <add name="Width" type="uint">Image width</add>
-        <add name="Height" type="uint">Image height</add>
-        <add name="Image Type" type="ImageType">The format of the raw image data.</add>
-        <add name="RGB Image Data" type="ByteColor3" arr1="Width" arr2="Height" cond="Image Type == 1" >Image pixel data.</add>
-        <add name="RGBA Image Data" type="ByteColor4" arr1="Width" arr2="Height" cond="Image Type == 2" >Image pixel data.</add>
+        <field name="Width" type="uint">Image width</field>
+        <field name="Height" type="uint">Image height</field>
+        <field name="Image Type" type="ImageType">The format of the raw image data.</field>
+        <field name="RGB Image Data" type="ByteColor3" arr1="Width" arr2="Height" cond="Image Type == 1" >Image pixel data.</field>
+        <field name="RGBA Image Data" type="ByteColor4" arr1="Width" arr2="Height" cond="Image Type == 2" >Image pixel data.</field>
     </niobject>
     
     <niobject name="NiAccumulator" abstract="true" inherit="NiObject" module="NiMain" />
 
     <niobject name="NiSortAdjustNode" inherit="NiNode" module="NiMain">
         Used to turn sorting off for individual subtrees in a scene. Useful if objects must be drawn in a fixed order.
-        <add name="Sorting Mode" type="SortingMode" default="SORTING_INHERIT">Sorting</add>
-        <add name="Accumulator" type="Ref" template="NiAccumulator" ver2="20.0.0.3" />
+        <field name="Sorting Mode" type="SortingMode" default="SORTING_INHERIT">Sorting</field>
+        <field name="Accumulator" type="Ref" template="NiAccumulator" ver2="20.0.0.3" />
     </niobject>
 
     <niobject name="NiSourceCubeMap" inherit="NiSourceTexture" module="NiLegacy">
@@ -5359,22 +5359,22 @@
 
     <niobject name="NiPhysXScene" inherit="NiObjectNET" module="NiPhysX" since="V20_2_0_8">
         Object which manages a NxScene object and the Gamebryo objects that interact with it.
-        <add name="Scene Transform" type="NiTransform" />
-        <add name="PhysX to World Scale" type="float" default="1.0" />
-        <add name="Num Props" type="uint" ver1="20.3.0.2" />
-        <add name="Props" type="Ref" template="NiPhysXProp" arr1="Num Props" ver1="20.3.0.2" />
-        <add name="Num Sources" type="uint" />
-        <add name="Sources" type="Ref" template="NiPhysXSrc" arr1="Num Sources" />
-        <add name="Num Dests" type="uint" />
-        <add name="Dests" type="Ref" template="NiPhysXDest" arr1="Num Dests" />
-        <add name="Num Modified Meshes" type="uint" ver1="20.4.0.0" />
-        <add name="Modified Meshes" type="Ref" template="NiMesh" arr1="Num Modified Meshes" ver1="20.4.0.0" />
-        <add name="Time Step" type="float" default="0.016666" ver1="20.2.0.8" />
-        <add name="Keep Meshes" type="bool" ver1="20.2.0.8" ver2="20.3.0.1" />
-        <add name="Num Sub Steps" type="uint" default="1" ver1="20.3.0.9" />
-        <add name="Max Sub Steps" type="uint" default="8" ver1="20.3.0.9" />
-        <add name="Snapshot" type="Ref" template="NiPhysXSceneDesc" />
-        <add name="Flags" type="ushort" />
+        <field name="Scene Transform" type="NiTransform" />
+        <field name="PhysX to World Scale" type="float" default="1.0" />
+        <field name="Num Props" type="uint" ver1="20.3.0.2" />
+        <field name="Props" type="Ref" template="NiPhysXProp" arr1="Num Props" ver1="20.3.0.2" />
+        <field name="Num Sources" type="uint" />
+        <field name="Sources" type="Ref" template="NiPhysXSrc" arr1="Num Sources" />
+        <field name="Num Dests" type="uint" />
+        <field name="Dests" type="Ref" template="NiPhysXDest" arr1="Num Dests" />
+        <field name="Num Modified Meshes" type="uint" ver1="20.4.0.0" />
+        <field name="Modified Meshes" type="Ref" template="NiMesh" arr1="Num Modified Meshes" ver1="20.4.0.0" />
+        <field name="Time Step" type="float" default="0.016666" ver1="20.2.0.8" />
+        <field name="Keep Meshes" type="bool" ver1="20.2.0.8" ver2="20.3.0.1" />
+        <field name="Num Sub Steps" type="uint" default="1" ver1="20.3.0.9" />
+        <field name="Max Sub Steps" type="uint" default="8" ver1="20.3.0.9" />
+        <field name="Snapshot" type="Ref" template="NiPhysXSceneDesc" />
+        <field name="Flags" type="ushort" />
     </niobject>
 
     <enum name="NiSceneDescNxBroadPhaseType" storage="uint" prefix="NX" since="V20_2_0_8">
@@ -5474,147 +5474,147 @@
     </bitflags>
 
     <compound name="NiPhysXMaterialDescMap" size="6" since="V20_2_0_8">
-        <add name="Key" type="ushort" />
-        <add name="Material" type="Ref" template="NiPhysXMaterialDesc" />
+        <field name="Key" type="ushort" />
+        <field name="Material" type="Ref" template="NiPhysXMaterialDesc" />
     </compound>
 
     <compound name="NxCompartmentDescMap" size="20" since="V20_2_0_8">
-        <add name="ID" type="uint" />
-        <add name="Type" type="NxCompartmentType" default="SCT_RIGIDBODY" />
-        <add name="Device Code" type="NxDeviceCode" default="CPU" />
-        <add name="Grid Hash Cell Size" type="float" default="100.0" />
-        <add name="Grid Hash Table Power" type="uint" default="8" />
+        <field name="ID" type="uint" />
+        <field name="Type" type="NxCompartmentType" default="SCT_RIGIDBODY" />
+        <field name="Device Code" type="NxDeviceCode" default="CPU" />
+        <field name="Grid Hash Cell Size" type="float" default="100.0" />
+        <field name="Grid Hash Table Power" type="uint" default="8" />
     </compound>
 
     <niobject name="NiPhysXSceneDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         Object which caches the properties of NxScene, stored as a snapshot in a NiPhysXScene.
-        <add name="Broad Phase Type" type="NiSceneDescNxBroadPhaseType" ver2="20.2.0.7" />
-        <add name="Gravity" type="Vector3" />
-        <add name="Max Timestep" type="float" default="0.016666" />
-        <add name="Max Iterations" type="uint" default="8" />
-        <add name="Time Step Method" type="NxTimeStepMethod" default="TIMESTEP_FIXED" />
-        <add name="Has Bound" type="bool" />
-        <add name="Max Bounds Min" type="Vector3" cond="Has Bound" />
-        <add name="Max Bounds Max" type="Vector3" cond="Has Bound" />
-        <add name="Has Limits" type="bool" />
-        <add name="Max Actors" type="uint" cond="Has Limits" />
-        <add name="Max Bodies" type="uint" cond="Has Limits" />
-        <add name="Max Static Shapes" type="uint" cond="Has Limits" />
-        <add name="Max Dynamic Shapes" type="uint" cond="Has Limits" />
-        <add name="Simulation Type" type="NxSimulationType" default="SIMULATION_SW" />
-        <add name="HW Scene Type" type="NiSceneDescNxHwSceneType" ver2="20.2.0.8" />
-        <add name="HW Pipeline Spec" type="NiSceneDescNxHwPipelineSpec" ver2="20.2.0.8" />
-        <add name="Ground Plane" type="bool" />
-        <add name="Bounds Plane" type="bool" />
-        <add name="Collision Detection" type="bool" ver2="20.2.0.7" />
-        <add name="Flags" type="uint" ver1="20.2.0.8" />
-        <add name="Internal Thread Count" type="uint" ver1="20.2.0.8" />
-        <add name="Background Thread Count" type="uint" ver1="20.2.0.8" />
-        <add name="Thread Mask" type="uint" ver1="20.2.0.8" />
-        <add name="Background Thread Priority" type="uint" ver1="20.5.0.3" />
-        <add name="Background Thread Mask" type="uint" ver1="20.2.0.8" />
-        <add name="Num HW Scenes" type="uint" ver1="20.3.0.1" ver2="20.3.0.5" />
-        <add name="Sim Thread Stack Size" type="uint" ver1="20.3.0.1" />
-        <add name="Sim Thread Priority" type="NxThreadPriority" default="TP_NORMAL" ver1="20.3.0.1" />
-        <add name="Worker Thread Stack Size" type="uint" ver1="20.3.0.1" />
-        <add name="Worker Thread Priority" type="NxThreadPriority" default="TP_NORMAL" ver1="20.3.0.1" />
-        <add name="Up Axis" type="uint" ver1="20.3.0.1" />
-        <add name="Subdivision Level" type="uint" default="5" ver1="20.3.0.1" />
-        <add name="Static Structure" type="NxPruningStructure" default="PRUNING_NONE" ver1="20.3.0.1" />
-        <add name="Dynamic Structure" type="NxPruningStructure" default="PRUNING_STATIC_AABB_TREE" ver1="20.3.0.1" />
-        <add name="Dynamic Tree Rebuild Rate Hint" type="uint" ver1="20.5.0.3" />
-        <add name="Broad Phase Type" type="NxBroadPhaseType" ver1="20.4.0.0" />
-        <add name="Grid Cells X" type="uint" ver1="20.4.0.0" />
-        <add name="Grid Cells Y" type="uint" ver1="20.4.0.0" />
-        <add name="Num Actors" type="uint" ver2="20.3.0.1" />
-        <add name="Actors" type="Ref" template="NiPhysXActorDesc" arr1="Num Actors" ver2="20.3.0.1" />
-        <add name="Num Joints" type="uint" ver2="20.3.0.1" />
-        <add name="Joints" type="Ref" template="NiPhysXJointDesc" arr1="Num Joints" ver2="20.3.0.1" />
-        <add name="Num Materials" type="uint" ver2="20.3.0.1" />
-        <add name="Materials" type="NiPhysXMaterialDescMap" arr1="Num Materials" ver2="20.3.0.1" />
-        <add name="Group Collision Flags" type="bool" arr1="1024" />
-        <add name="Filter Ops" type="NxFilterOp" arr1="3" />
-        <add name="Filter Constants" type="uint" arr1="8" />
-        <add name="Filter" type="bool" default="1" />
-        <add name="Num States" type="uint" ver2="20.3.0.1" />
-        <add name="Num Compartments" type="uint" ver1="20.3.0.6" />
-        <add name="Compartments" type="NxCompartmentDescMap" arr1="Num Compartments" ver1="20.3.0.6" />
+        <field name="Broad Phase Type" type="NiSceneDescNxBroadPhaseType" ver2="20.2.0.7" />
+        <field name="Gravity" type="Vector3" />
+        <field name="Max Timestep" type="float" default="0.016666" />
+        <field name="Max Iterations" type="uint" default="8" />
+        <field name="Time Step Method" type="NxTimeStepMethod" default="TIMESTEP_FIXED" />
+        <field name="Has Bound" type="bool" />
+        <field name="Max Bounds Min" type="Vector3" cond="Has Bound" />
+        <field name="Max Bounds Max" type="Vector3" cond="Has Bound" />
+        <field name="Has Limits" type="bool" />
+        <field name="Max Actors" type="uint" cond="Has Limits" />
+        <field name="Max Bodies" type="uint" cond="Has Limits" />
+        <field name="Max Static Shapes" type="uint" cond="Has Limits" />
+        <field name="Max Dynamic Shapes" type="uint" cond="Has Limits" />
+        <field name="Simulation Type" type="NxSimulationType" default="SIMULATION_SW" />
+        <field name="HW Scene Type" type="NiSceneDescNxHwSceneType" ver2="20.2.0.8" />
+        <field name="HW Pipeline Spec" type="NiSceneDescNxHwPipelineSpec" ver2="20.2.0.8" />
+        <field name="Ground Plane" type="bool" />
+        <field name="Bounds Plane" type="bool" />
+        <field name="Collision Detection" type="bool" ver2="20.2.0.7" />
+        <field name="Flags" type="uint" ver1="20.2.0.8" />
+        <field name="Internal Thread Count" type="uint" ver1="20.2.0.8" />
+        <field name="Background Thread Count" type="uint" ver1="20.2.0.8" />
+        <field name="Thread Mask" type="uint" ver1="20.2.0.8" />
+        <field name="Background Thread Priority" type="uint" ver1="20.5.0.3" />
+        <field name="Background Thread Mask" type="uint" ver1="20.2.0.8" />
+        <field name="Num HW Scenes" type="uint" ver1="20.3.0.1" ver2="20.3.0.5" />
+        <field name="Sim Thread Stack Size" type="uint" ver1="20.3.0.1" />
+        <field name="Sim Thread Priority" type="NxThreadPriority" default="TP_NORMAL" ver1="20.3.0.1" />
+        <field name="Worker Thread Stack Size" type="uint" ver1="20.3.0.1" />
+        <field name="Worker Thread Priority" type="NxThreadPriority" default="TP_NORMAL" ver1="20.3.0.1" />
+        <field name="Up Axis" type="uint" ver1="20.3.0.1" />
+        <field name="Subdivision Level" type="uint" default="5" ver1="20.3.0.1" />
+        <field name="Static Structure" type="NxPruningStructure" default="PRUNING_NONE" ver1="20.3.0.1" />
+        <field name="Dynamic Structure" type="NxPruningStructure" default="PRUNING_STATIC_AABB_TREE" ver1="20.3.0.1" />
+        <field name="Dynamic Tree Rebuild Rate Hint" type="uint" ver1="20.5.0.3" />
+        <field name="Broad Phase Type" type="NxBroadPhaseType" ver1="20.4.0.0" />
+        <field name="Grid Cells X" type="uint" ver1="20.4.0.0" />
+        <field name="Grid Cells Y" type="uint" ver1="20.4.0.0" />
+        <field name="Num Actors" type="uint" ver2="20.3.0.1" />
+        <field name="Actors" type="Ref" template="NiPhysXActorDesc" arr1="Num Actors" ver2="20.3.0.1" />
+        <field name="Num Joints" type="uint" ver2="20.3.0.1" />
+        <field name="Joints" type="Ref" template="NiPhysXJointDesc" arr1="Num Joints" ver2="20.3.0.1" />
+        <field name="Num Materials" type="uint" ver2="20.3.0.1" />
+        <field name="Materials" type="NiPhysXMaterialDescMap" arr1="Num Materials" ver2="20.3.0.1" />
+        <field name="Group Collision Flags" type="bool" arr1="1024" />
+        <field name="Filter Ops" type="NxFilterOp" arr1="3" />
+        <field name="Filter Constants" type="uint" arr1="8" />
+        <field name="Filter" type="bool" default="1" />
+        <field name="Num States" type="uint" ver2="20.3.0.1" />
+        <field name="Num Compartments" type="uint" ver1="20.3.0.6" />
+        <field name="Compartments" type="NxCompartmentDescMap" arr1="Num Compartments" ver1="20.3.0.6" />
     </niobject>
 
     <niobject name="NiPhysXProp" inherit="NiObjectNET" module="NiPhysX" since="V20_2_0_8">
         A PhysX prop which holds information about PhysX actors in a Gamebryo scene
-        <add name="PhysX to World Scale" type="float" default="1.0" />
-        <add name="Num Sources" type="uint" />
-        <add name="Sources" type="Ref" template="NiPhysXSrc" arr1="Num Sources" />
-        <add name="Num Dests" type="uint" />
-        <add name="Dests" type="Ref" template="NiPhysXDest" arr1="Num Dests" />
-        <add name="Num Modified Meshes" type="uint" ver1="20.4.0.0" />
-        <add name="Modified Meshes" type="Ref" template="NiMesh" arr1="Num Modified Meshes" ver1="20.4.0.0" />
-        <add name="Temp Name" type="NiFixedString" ver1="30.1.0.2" ver2="30.2.0.2" />
-        <add name="Keep Meshes" type="bool" />
-        <add name="Snapshot" type="Ref" template="NiPhysXPropDesc" />
+        <field name="PhysX to World Scale" type="float" default="1.0" />
+        <field name="Num Sources" type="uint" />
+        <field name="Sources" type="Ref" template="NiPhysXSrc" arr1="Num Sources" />
+        <field name="Num Dests" type="uint" />
+        <field name="Dests" type="Ref" template="NiPhysXDest" arr1="Num Dests" />
+        <field name="Num Modified Meshes" type="uint" ver1="20.4.0.0" />
+        <field name="Modified Meshes" type="Ref" template="NiMesh" arr1="Num Modified Meshes" ver1="20.4.0.0" />
+        <field name="Temp Name" type="NiFixedString" ver1="30.1.0.2" ver2="30.2.0.2" />
+        <field name="Keep Meshes" type="bool" />
+        <field name="Snapshot" type="Ref" template="NiPhysXPropDesc" />
     </niobject>
 
     <niobject name="NiPhysXPropDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serialization of PhysX objects and to attach them to the scene.
-        <add name="Num Actors" type="uint" />
-        <add name="Actors" type="Ref" template="NiPhysXActorDesc" arr1="Num Actors" />
-        <add name="Num Joints" type="uint" />
-        <add name="Joints" type="Ref" template="NiPhysXJointDesc" arr1="Num Joints" />
-        <add name="Num Clothes" type="uint" ver1="20.3.0.5" />
-        <add name="Clothes" type="Ref" template="NiPhysXClothDesc" arr1="Num Clothes" ver1="20.3.0.5" />
-        <add name="Num Materials" type="uint" />
-        <add name="Materials" type="NiPhysXMaterialDescMap" arr1="Num Materials" />
-        <add name="Num States" type="uint" />
-        <add name="State Names" type="NiTFixedStringMap" template="uint" ver1="20.4.0.0" />
-        <add name="Flags" type="byte" ver1="20.4.0.0" />
+        <field name="Num Actors" type="uint" />
+        <field name="Actors" type="Ref" template="NiPhysXActorDesc" arr1="Num Actors" />
+        <field name="Num Joints" type="uint" />
+        <field name="Joints" type="Ref" template="NiPhysXJointDesc" arr1="Num Joints" />
+        <field name="Num Clothes" type="uint" ver1="20.3.0.5" />
+        <field name="Clothes" type="Ref" template="NiPhysXClothDesc" arr1="Num Clothes" ver1="20.3.0.5" />
+        <field name="Num Materials" type="uint" />
+        <field name="Materials" type="NiPhysXMaterialDescMap" arr1="Num Materials" />
+        <field name="Num States" type="uint" />
+        <field name="State Names" type="NiTFixedStringMap" template="uint" ver1="20.4.0.0" />
+        <field name="Flags" type="byte" ver1="20.4.0.0" />
     </niobject>
 
     <niobject name="NiPhysXActorDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxActor objects.
-        <add name="Actor Name" type="NiFixedString" />
-        <add name="Num Poses" type="uint" />
-        <add name="Poses" type="Matrix34" arr1="Num Poses" />
-        <add name="Body Desc" type="Ref" template="NiPhysXBodyDesc" />
-        <add name="Density" type="float" />
-        <add name="Actor Flags" type="uint" />
-        <add name="Actor Group" type="ushort" />
-        <add name="Dominance Group" type="ushort" ver1="20.4.0.0" />
-        <add name="Contact Report Flags" type="uint" ver1="20.4.0.0" />
-        <add name="Force Field Material" type="ushort" ver1="20.4.0.0" />
-        <add name="Dummy" type="uint" ver1="20.3.0.1" ver2="20.3.0.5" />
-        <add name="Num Shape Descs" type="uint" />
-        <add name="Shape Descriptions" type="Ref" template="NiPhysXShapeDesc" arr1="Num Shape Descs" />
-        <add name="Actor Parent" type="Ref" template="NiPhysXActorDesc" />
-        <add name="Source" type="Ref" template="NiPhysXRigidBodySrc" />
-        <add name="Dest" type="Ref" template="NiPhysXRigidBodyDest" />
+        <field name="Actor Name" type="NiFixedString" />
+        <field name="Num Poses" type="uint" />
+        <field name="Poses" type="Matrix34" arr1="Num Poses" />
+        <field name="Body Desc" type="Ref" template="NiPhysXBodyDesc" />
+        <field name="Density" type="float" />
+        <field name="Actor Flags" type="uint" />
+        <field name="Actor Group" type="ushort" />
+        <field name="Dominance Group" type="ushort" ver1="20.4.0.0" />
+        <field name="Contact Report Flags" type="uint" ver1="20.4.0.0" />
+        <field name="Force Field Material" type="ushort" ver1="20.4.0.0" />
+        <field name="Dummy" type="uint" ver1="20.3.0.1" ver2="20.3.0.5" />
+        <field name="Num Shape Descs" type="uint" />
+        <field name="Shape Descriptions" type="Ref" template="NiPhysXShapeDesc" arr1="Num Shape Descs" />
+        <field name="Actor Parent" type="Ref" template="NiPhysXActorDesc" />
+        <field name="Source" type="Ref" template="NiPhysXRigidBodySrc" />
+        <field name="Dest" type="Ref" template="NiPhysXRigidBodyDest" />
     </niobject>
 
     <compound name="PhysXBodyStoredVels" since="V20_2_0_8">
-        <add name="Linear Velocity" type="Vector3" />
-        <add name="Angular Velocity" type="Vector3" />
-        <add name="Sleep" type="bool" ver1="30.2.0.3" />
+        <field name="Linear Velocity" type="Vector3" />
+        <field name="Angular Velocity" type="Vector3" />
+        <field name="Sleep" type="bool" ver1="30.2.0.3" />
     </compound>
 
     <niobject name="NiPhysXBodyDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxBodyDesc objects.
-        <add name="Local Pose" type="Matrix34" />
-        <add name="Space Inertia" type="Vector3" />
-        <add name="Mass" type="float" />
-        <add name="Num Vels" type="uint" />
-        <add name="Vels" type="PhysXBodyStoredVels" arr1="Num Vels" />
-        <add name="Wake Up Counter" type="float" default="0.4" />
-        <add name="Linear Damping" type="float" />
-        <add name="Angular Damping" type="float" default="0.05" />
-        <add name="Max Angular Velocity" type="float" default="-1.0" />
-        <add name="CCD Motion Threshold" type="float" />
-        <add name="Flags" type="NxBodyFlag" default="0x900" />
-        <add name="Sleep Linear Velocity" type="float" default="-1.0" />
-        <add name="Sleep Angular Velocity" type="float" default="-1.0" />
-        <add name="Solver Iteration Count" type="uint" default="4" />
-        <add name="Sleep Energy Threshold" type="float" default="-1.0" ver1="20.3.0.0" />
-        <add name="Sleep Damping" type="float" ver1="20.3.0.0" />
-        <add name="Contact Report Threshold" type="float" default="#FLT_MAX#" ver1="20.4.0.0" />
+        <field name="Local Pose" type="Matrix34" />
+        <field name="Space Inertia" type="Vector3" />
+        <field name="Mass" type="float" />
+        <field name="Num Vels" type="uint" />
+        <field name="Vels" type="PhysXBodyStoredVels" arr1="Num Vels" />
+        <field name="Wake Up Counter" type="float" default="0.4" />
+        <field name="Linear Damping" type="float" />
+        <field name="Angular Damping" type="float" default="0.05" />
+        <field name="Max Angular Velocity" type="float" default="-1.0" />
+        <field name="CCD Motion Threshold" type="float" />
+        <field name="Flags" type="NxBodyFlag" default="0x900" />
+        <field name="Sleep Linear Velocity" type="float" default="-1.0" />
+        <field name="Sleep Angular Velocity" type="float" default="-1.0" />
+        <field name="Solver Iteration Count" type="uint" default="4" />
+        <field name="Sleep Energy Threshold" type="float" default="-1.0" ver1="20.3.0.0" />
+        <field name="Sleep Damping" type="float" ver1="20.3.0.0" />
+        <field name="Contact Report Threshold" type="float" default="#FLT_MAX#" ver1="20.4.0.0" />
     </niobject>
 
     <enum name="NxJointType" storage="uint" prefix="NX_JOINT" since="V20_2_0_8">
@@ -5648,75 +5648,75 @@
     </enum>
 
     <compound name="NiPhysXJointActor" size="40" since="V20_2_0_8">
-        <add name="Actor" type="Ref" template="NiPhysXActorDesc" />
-        <add name="Local Normal" type="Vector3" />
-        <add name="Local Axis" type="Vector3" />
-        <add name="Local Anchor" type="Vector3" />
+        <field name="Actor" type="Ref" template="NiPhysXActorDesc" />
+        <field name="Local Normal" type="Vector3" />
+        <field name="Local Axis" type="Vector3" />
+        <field name="Local Anchor" type="Vector3" />
     </compound>
 
     <compound name="NxJointLimitSoftDesc" size="16" since="V20_2_0_8">
-        <add name="Value" type="float" />
-        <add name="Restitution" type="float" />
-        <add name="Spring" type="float" />
-        <add name="Damping" type="float" />
+        <field name="Value" type="float" />
+        <field name="Restitution" type="float" />
+        <field name="Spring" type="float" />
+        <field name="Damping" type="float" />
     </compound>
 
     <compound name="NxJointDriveDesc" size="16" since="V20_2_0_8">
-        <add name="Drive Type" type="NxD6JointDriveType" />
-        <add name="Spring" type="float" />
-        <add name="Damping" type="float" />
-        <add name="Force Limit" type="float" default="#FLT_MAX#" />
+        <field name="Drive Type" type="NxD6JointDriveType" />
+        <field name="Spring" type="float" />
+        <field name="Damping" type="float" />
+        <field name="Force Limit" type="float" default="#FLT_MAX#" />
     </compound>
 
     <compound name="NiPhysXJointLimit" since="V20_2_0_8">
-        <add name="Limit Plane Normal" type="Vector3" />
-        <add name="Limit Plane D" type="float" />
-        <add name="Limit Plane R" type="float" ver1="20.4.0.0" />
+        <field name="Limit Plane Normal" type="Vector3" />
+        <field name="Limit Plane D" type="float" />
+        <field name="Limit Plane R" type="float" ver1="20.4.0.0" />
     </compound>
 
     <niobject name="NiPhysXJointDesc" abstract="true" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         A PhysX Joint abstract base class.
-        <add name="Joint Type" type="NxJointType" />
-        <add name="Joint Name" type="NiFixedString" />
-        <add name="Actors" type="NiPhysXJointActor" arr1="2" />
-        <add name="Max Force" type="float" />
-        <add name="Max Torque" type="float" />
-        <add name="Solver Extrapolation Factor" type="float" ver1="20.5.0.3" />
-        <add name="Use Acceleration Spring" type="uint" ver1="20.5.0.3" />
-        <add name="Joint Flags" type="uint" />
-        <add name="Limit Point" type="Vector3" />
-        <add name="Num Limits" type="uint" />
-        <add name="Limits" type="NiPhysXJointLimit" arr1="Num Limits" />
+        <field name="Joint Type" type="NxJointType" />
+        <field name="Joint Name" type="NiFixedString" />
+        <field name="Actors" type="NiPhysXJointActor" arr1="2" />
+        <field name="Max Force" type="float" />
+        <field name="Max Torque" type="float" />
+        <field name="Solver Extrapolation Factor" type="float" ver1="20.5.0.3" />
+        <field name="Use Acceleration Spring" type="uint" ver1="20.5.0.3" />
+        <field name="Joint Flags" type="uint" />
+        <field name="Limit Point" type="Vector3" />
+        <field name="Num Limits" type="uint" />
+        <field name="Limits" type="NiPhysXJointLimit" arr1="Num Limits" />
     </niobject>
 
     <niobject name="NiPhysXD6JointDesc" inherit="NiPhysXJointDesc" module="NiPhysX" since="V20_2_0_8">
         A 6DOF (6 degrees of freedom) joint.
-        <add name="X Motion" type="NxD6JointMotion" default="MOTION_FREE" />
-        <add name="Y Motion" type="NxD6JointMotion" default="MOTION_FREE" />
-        <add name="Z Motion" type="NxD6JointMotion" default="MOTION_FREE" />
-        <add name="Swing 1 Motion" type="NxD6JointMotion" default="MOTION_FREE" />
-        <add name="Swing 2 Motion" type="NxD6JointMotion" default="MOTION_FREE" />
-        <add name="Twist Motion" type="NxD6JointMotion" default="MOTION_FREE" />
-        <add name="Linear Limit" type="NxJointLimitSoftDesc" />
-        <add name="Swing 1 Limit" type="NxJointLimitSoftDesc" />
-        <add name="Swing 2 Limit" type="NxJointLimitSoftDesc" />
-        <add name="Twist Low Limit" type="NxJointLimitSoftDesc" />
-        <add name="Twist High Limit" type="NxJointLimitSoftDesc" />
-        <add name="X Drive" type="NxJointDriveDesc" />
-        <add name="Y Drive" type="NxJointDriveDesc" />
-        <add name="Z Drive" type="NxJointDriveDesc" />
-        <add name="Swing Drive" type="NxJointDriveDesc" />
-        <add name="Twist Drive" type="NxJointDriveDesc" />
-        <add name="Slerp Drive" type="NxJointDriveDesc" />
-        <add name="Drive Position" type="Vector3" />
-        <add name="Drive Orientation" type="Quaternion" />
-        <add name="Drive Linear Velocity" type="Vector3" />
-        <add name="Drive Angular Velocity" type="Vector3" />
-        <add name="Projection Mode" type="NxJointProjectionMode" />
-        <add name="Projection Distance" type="float" default="0.1" />
-        <add name="Projection Angle" type="float" default="0.0872" />
-        <add name="Gear Ratio" type="float" default="1.0" />
-        <add name="Flags" type="uint" />
+        <field name="X Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <field name="Y Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <field name="Z Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <field name="Swing 1 Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <field name="Swing 2 Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <field name="Twist Motion" type="NxD6JointMotion" default="MOTION_FREE" />
+        <field name="Linear Limit" type="NxJointLimitSoftDesc" />
+        <field name="Swing 1 Limit" type="NxJointLimitSoftDesc" />
+        <field name="Swing 2 Limit" type="NxJointLimitSoftDesc" />
+        <field name="Twist Low Limit" type="NxJointLimitSoftDesc" />
+        <field name="Twist High Limit" type="NxJointLimitSoftDesc" />
+        <field name="X Drive" type="NxJointDriveDesc" />
+        <field name="Y Drive" type="NxJointDriveDesc" />
+        <field name="Z Drive" type="NxJointDriveDesc" />
+        <field name="Swing Drive" type="NxJointDriveDesc" />
+        <field name="Twist Drive" type="NxJointDriveDesc" />
+        <field name="Slerp Drive" type="NxJointDriveDesc" />
+        <field name="Drive Position" type="Vector3" />
+        <field name="Drive Orientation" type="Quaternion" />
+        <field name="Drive Linear Velocity" type="Vector3" />
+        <field name="Drive Angular Velocity" type="Vector3" />
+        <field name="Projection Mode" type="NxJointProjectionMode" />
+        <field name="Projection Distance" type="float" default="0.1" />
+        <field name="Projection Angle" type="float" default="0.0872" />
+        <field name="Gear Ratio" type="float" default="1.0" />
+        <field name="Flags" type="uint" />
     </niobject>
 
     <enum name="NxShapeType" storage="uint" prefix="NX" since="V20_2_0_8">
@@ -5756,47 +5756,47 @@
     </bitflags>
 
     <compound name="NxPlane" size="16" since="V20_2_0_8">
-        <add name="Val 1" type="float" />
-        <add name="Point 1" type="Vector3" />
+        <field name="Val 1" type="float" />
+        <field name="Point 1" type="Vector3" />
     </compound>
 
     <compound name="NxCapsule" size="12" since="V20_2_0_8">
-        <add name="Val 1" type="float" />
-        <add name="Val 2" type="float" />
-        <add name="Capsule Flags" type="uint" />
+        <field name="Val 1" type="float" />
+        <field name="Val 2" type="float" />
+        <field name="Capsule Flags" type="uint" />
     </compound>
 
     <niobject name="NiPhysXShapeDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxShapeDesc objects
-        <add name="Shape Type" type="NxShapeType" />
-        <add name="Local Pose" type="Matrix34" />
-        <add name="Flags" type="NxShapeFlag" default="0x120008" />
-        <add name="Collision Group" type="ushort" />
-        <add name="Material Index" type="ushort" />
-        <add name="Density" type="float" default="1.0" />
-        <add name="Mass" type="float" default="-1.0" />
-        <add name="Skin Width" type="float" default="-1.0" />
-        <add name="Shape Name" type="NiFixedString" />
-        <add name="Non Interacting Compartment Types" type="uint" ver1="20.4.0.0" />
-        <add name="Collision Bits" type="uint" arr1="4" />
-        <add name="Plane" type="NxPlane" cond="Shape Type == 0" />
-        <add name="Sphere Radius" type="float" cond="Shape Type == 1" />
-        <add name="Box Half Extents" type="Vector3" cond="Shape Type == 2" />
-        <add name="Capsule" type="NxCapsule" cond="Shape Type == 3" />
-        <add name="Mesh" type="Ref" template="NiPhysXMeshDesc" cond="(Shape Type == 5) || (Shape Type == 6)" />
+        <field name="Shape Type" type="NxShapeType" />
+        <field name="Local Pose" type="Matrix34" />
+        <field name="Flags" type="NxShapeFlag" default="0x120008" />
+        <field name="Collision Group" type="ushort" />
+        <field name="Material Index" type="ushort" />
+        <field name="Density" type="float" default="1.0" />
+        <field name="Mass" type="float" default="-1.0" />
+        <field name="Skin Width" type="float" default="-1.0" />
+        <field name="Shape Name" type="NiFixedString" />
+        <field name="Non Interacting Compartment Types" type="uint" ver1="20.4.0.0" />
+        <field name="Collision Bits" type="uint" arr1="4" />
+        <field name="Plane" type="NxPlane" cond="Shape Type == 0" />
+        <field name="Sphere Radius" type="float" cond="Shape Type == 1" />
+        <field name="Box Half Extents" type="Vector3" cond="Shape Type == 2" />
+        <field name="Capsule" type="NxCapsule" cond="Shape Type == 3" />
+        <field name="Mesh" type="Ref" template="NiPhysXMeshDesc" cond="(Shape Type == 5) || (Shape Type == 6)" />
     </niobject>
 
     <niobject name="NiPhysXMeshDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         Holds mesh data for streaming.
-        <add name="Is Convex" type="bool" ver2="20.3.0.4" />
-        <add name="Mesh Name" type="NiFixedString" />
-        <add name="Mesh Data" type="ByteArray" />
-        <add name="Back Compat Vertex Map Size" type="ushort" ver1="20.3.0.5" ver2="30.2.0.2" />
-        <add name="Back Compat Vertex Map" type="ushort" arr1="Back Compat Vertex Map Size" ver1="20.3.0.5" ver2="30.2.0.2" />
-        <add name="Mesh Flags" type="uint" />
-        <add name="Mesh Paging Mode" type="uint" ver1="20.3.0.1" />
-        <add name="Is Hardware" type="bool" ver1="20.3.0.2" ver2="20.3.0.4" />
-        <add name="Flags" type="byte" ver1="20.3.0.5" />
+        <field name="Is Convex" type="bool" ver2="20.3.0.4" />
+        <field name="Mesh Name" type="NiFixedString" />
+        <field name="Mesh Data" type="ByteArray" />
+        <field name="Back Compat Vertex Map Size" type="ushort" ver1="20.3.0.5" ver2="30.2.0.2" />
+        <field name="Back Compat Vertex Map" type="ushort" arr1="Back Compat Vertex Map Size" ver1="20.3.0.5" ver2="30.2.0.2" />
+        <field name="Mesh Flags" type="uint" />
+        <field name="Mesh Paging Mode" type="uint" ver1="20.3.0.1" />
+        <field name="Is Hardware" type="bool" ver1="20.3.0.2" ver2="20.3.0.4" />
+        <field name="Flags" type="byte" ver1="20.3.0.5" />
     </niobject>
 
     <bitflags name="NxMaterialFlag" storage="uint" prefix="NX_MF" since="V20_2_0_8">
@@ -5806,9 +5806,9 @@
     </bitflags>
 
     <compound name="NxSpringDesc" size="12" since="V20_2_0_8">
-        <add name="Spring" type="float" />
-        <add name="Damper" type="float" />
-        <add name="Target Value" type="float" />
+        <field name="Spring" type="float" />
+        <field name="Damper" type="float" />
+        <field name="Target Value" type="float" />
     </compound>
 
     <enum name="NxCombineMode" storage="uint" prefix="NX_CM" since="V20_2_0_8">
@@ -5819,24 +5819,24 @@
     </enum>
 
     <compound name="NxMaterialDesc" since="V20_2_0_8">
-        <add name="Dynamic Friction" type="float" />
-        <add name="Static Friction" type="float" />
-        <add name="Restitution" type="float" />
-        <add name="Dynamic Friction V" type="float" />
-        <add name="Static Friction V" type="float" />
-        <add name="Direction of Anisotropy" type="Vector3" default="#X_AXIS#" />
-        <add name="Flags" type="NxMaterialFlag" />
-        <add name="Friction Combine Mode" type="NxCombineMode" />
-        <add name="Restitution Combine Mode" type="NxCombineMode" />
-        <add name="Has Spring" type="bool" ver2="20.2.3.0" />
-        <add name="Spring" type="NxSpringDesc" ver2="20.2.3.0" cond="Has Spring" />
+        <field name="Dynamic Friction" type="float" />
+        <field name="Static Friction" type="float" />
+        <field name="Restitution" type="float" />
+        <field name="Dynamic Friction V" type="float" />
+        <field name="Static Friction V" type="float" />
+        <field name="Direction of Anisotropy" type="Vector3" default="#X_AXIS#" />
+        <field name="Flags" type="NxMaterialFlag" />
+        <field name="Friction Combine Mode" type="NxCombineMode" />
+        <field name="Restitution Combine Mode" type="NxCombineMode" />
+        <field name="Has Spring" type="bool" ver2="20.2.3.0" />
+        <field name="Spring" type="NxSpringDesc" ver2="20.2.3.0" cond="Has Spring" />
     </compound>
 
     <niobject name="NiPhysXMaterialDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxMaterialDesc objects.
-        <add name="Index" type="ushort" />
-        <add name="Num States" type="uint" />
-        <add name="Material Descs" type="NxMaterialDesc" arr1="Num States" />
+        <field name="Index" type="ushort" />
+        <field name="Num States" type="uint" />
+        <field name="Material Descs" type="NxMaterialDesc" arr1="Num States" />
     </niobject>
 
     <bitflags name="NxClothFlag" storage="uint" prefix="NX_CLF" since="V20_2_0_8">
@@ -5861,74 +5861,74 @@
     </bitflags>
 
     <compound name="PhysXClothState" since="V20_2_0_8">
-        <add name="Pose" type="Matrix34" />
-        <add name="Num Vertex Positions" type="ushort" />
-        <add name="Vertex Positions" type="Vector3" arr1="Num Vertex Positions" />
-        <add name="Num Tear Indices" type="ushort" />
-        <add name="Tear Indices" type="ushort" arr1="Num Tear Indices" />
-        <add name="Tear Split Planes" type="Vector3" arr1="Num Tear Indices" />
+        <field name="Pose" type="Matrix34" />
+        <field name="Num Vertex Positions" type="ushort" />
+        <field name="Vertex Positions" type="Vector3" arr1="Num Vertex Positions" />
+        <field name="Num Tear Indices" type="ushort" />
+        <field name="Tear Indices" type="ushort" arr1="Num Tear Indices" />
+        <field name="Tear Split Planes" type="Vector3" arr1="Num Tear Indices" />
     </compound>
 
     <compound name="PhysXClothAttachmentPosition" since="V20_2_0_8">
-        <add name="Vertex ID" type="uint" />
-        <add name="Position" type="Vector3" />
-        <add name="Flags" type="uint" />
+        <field name="Vertex ID" type="uint" />
+        <field name="Position" type="Vector3" />
+        <field name="Flags" type="uint" />
     </compound>
 
     <compound name="PhysXClothAttachment" since="V20_2_0_8">
-        <add name="Shape" type="Ref" template="NiPhysXShapeDesc" />
-        <add name="Num Vertices" type="uint" />
-        <add name="Flags" type="uint" cond="Num Vertices == 0" />
-        <add name="Positions" type="PhysXClothAttachmentPosition" cond="Num Vertices #GT# 0" arr1="Num Vertices" />
+        <field name="Shape" type="Ref" template="NiPhysXShapeDesc" />
+        <field name="Num Vertices" type="uint" />
+        <field name="Flags" type="uint" cond="Num Vertices == 0" />
+        <field name="Positions" type="PhysXClothAttachmentPosition" cond="Num Vertices #GT# 0" arr1="Num Vertices" />
     </compound>
 
     <niobject name="NiPhysXClothDesc" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         For serializing NxClothDesc objects.
-        <add name="Name" type="NiFixedString" />
-        <add name="Mesh" type="Ref" template="NiPhysXMeshDesc" />
-        <add name="Pose" type="Matrix34" ver2="20.3.0.9" />
-        <add name="Thickness" type="float" default="0.01" />
-        <add name="Self Collision Thickness" type="float" ver1="30.1.0.3" />
-        <add name="Density" type="float" default="1.0" />
-        <add name="Bending Stiffness" type="float" default="1.0" />
-        <add name="Stretching Stiffness" type="float" default="1.0" />
-        <add name="Damping Coefficient" type="float" default="0.5" />
-        <add name="Hard Stretch Limitation Factor" type="float" ver1="30.1.0.3" />
-        <add name="Friction" type="float" default="0.5" />
-        <add name="Pressure" type="float" default="1.0" />
-        <add name="Tear Factor" type="float" default="1.5" />
-        <add name="Collision Response Coeff" type="float" default="0.2" />
-        <add name="Attach Response Coeff" type="float" default="0.2" />
-        <add name="Attach Tear Factor" type="float" default="1.5" />
-        <add name="To Fluid Response Coeff" type="float" default="1.0" ver1="20.4.0.0" />
-        <add name="From Fluid Response Coeff" type="float" default="1.0" ver1="20.4.0.0" />
-        <add name="Min Adhere Velocity" type="float" default="1.0" ver1="20.4.0.0" />
-        <add name="Relative Grid Spacing" type="float" default="0.25" ver1="20.4.0.0" />
-        <add name="Solver Iterations" type="uint" default="5" />
-        <add name="Hier Solver Iterations" type="uint" ver1="30.1.0.3" />
-        <add name="External Acceleration" type="Vector3" />
-        <add name="Wind Acceleration" type="Vector3" ver1="20.4.0.0" />
-        <add name="Wake Up Counter" type="float" default="0.4" />
-        <add name="Sleep Linear Velocity" type="float" default="-1.0" />
-        <add name="Collision Group" type="ushort" />
-        <add name="Collision Bits" type="uint" arr1="4" />
-        <add name="Force Field Material" type="ushort" ver1="20.4.0.0" />
-        <add name="Flags" type="NxClothFlag" default="0x20" />
-        <add name="Vertex Map Size" type="ushort" ver1="30.2.0.3" />
-        <add name="Vertex Map" type="ushort" arr1="Vertex Map Size" ver1="30.2.0.3" />
-        <add name="Num States" type="uint" ver1="20.4.0.0" />
-        <add name="States" type="PhysXClothState" arr1="Num States" ver1="20.4.0.0" />
-        <add name="Num Attachments" type="uint" />
-        <add name="Attachments" type="PhysXClothAttachment" arr1="Num Attachments" />
-        <add name="Parent Actor" type="Ref" template="NiPhysXActorDesc" />
-        <add name="Dest" type="Ref" template="NiPhysXDest" ver2="20.4.0.9" />
-        <add name="Target Mesh" type="Ref" template="NiMesh" ver2="20.5.0.0" />
+        <field name="Name" type="NiFixedString" />
+        <field name="Mesh" type="Ref" template="NiPhysXMeshDesc" />
+        <field name="Pose" type="Matrix34" ver2="20.3.0.9" />
+        <field name="Thickness" type="float" default="0.01" />
+        <field name="Self Collision Thickness" type="float" ver1="30.1.0.3" />
+        <field name="Density" type="float" default="1.0" />
+        <field name="Bending Stiffness" type="float" default="1.0" />
+        <field name="Stretching Stiffness" type="float" default="1.0" />
+        <field name="Damping Coefficient" type="float" default="0.5" />
+        <field name="Hard Stretch Limitation Factor" type="float" ver1="30.1.0.3" />
+        <field name="Friction" type="float" default="0.5" />
+        <field name="Pressure" type="float" default="1.0" />
+        <field name="Tear Factor" type="float" default="1.5" />
+        <field name="Collision Response Coeff" type="float" default="0.2" />
+        <field name="Attach Response Coeff" type="float" default="0.2" />
+        <field name="Attach Tear Factor" type="float" default="1.5" />
+        <field name="To Fluid Response Coeff" type="float" default="1.0" ver1="20.4.0.0" />
+        <field name="From Fluid Response Coeff" type="float" default="1.0" ver1="20.4.0.0" />
+        <field name="Min Adhere Velocity" type="float" default="1.0" ver1="20.4.0.0" />
+        <field name="Relative Grid Spacing" type="float" default="0.25" ver1="20.4.0.0" />
+        <field name="Solver Iterations" type="uint" default="5" />
+        <field name="Hier Solver Iterations" type="uint" ver1="30.1.0.3" />
+        <field name="External Acceleration" type="Vector3" />
+        <field name="Wind Acceleration" type="Vector3" ver1="20.4.0.0" />
+        <field name="Wake Up Counter" type="float" default="0.4" />
+        <field name="Sleep Linear Velocity" type="float" default="-1.0" />
+        <field name="Collision Group" type="ushort" />
+        <field name="Collision Bits" type="uint" arr1="4" />
+        <field name="Force Field Material" type="ushort" ver1="20.4.0.0" />
+        <field name="Flags" type="NxClothFlag" default="0x20" />
+        <field name="Vertex Map Size" type="ushort" ver1="30.2.0.3" />
+        <field name="Vertex Map" type="ushort" arr1="Vertex Map Size" ver1="30.2.0.3" />
+        <field name="Num States" type="uint" ver1="20.4.0.0" />
+        <field name="States" type="PhysXClothState" arr1="Num States" ver1="20.4.0.0" />
+        <field name="Num Attachments" type="uint" />
+        <field name="Attachments" type="PhysXClothAttachment" arr1="Num Attachments" />
+        <field name="Parent Actor" type="Ref" template="NiPhysXActorDesc" />
+        <field name="Dest" type="Ref" template="NiPhysXDest" ver2="20.4.0.9" />
+        <field name="Target Mesh" type="Ref" template="NiMesh" ver2="20.5.0.0" />
     </niobject>
 
     <niobject name="NiPhysXDest" abstract="true" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         A destination is a link between a PhysX actor and a Gamebryo object being driven by the physics.
-        <add name="Active" type="bool" default="1" />
-        <add name="Interpolate" type="bool" />
+        <field name="Active" type="bool" default="1" />
+        <field name="Interpolate" type="bool" />
     </niobject>
 
     <niobject name="NiPhysXRigidBodyDest" abstract="true" inherit="NiPhysXDest" module="NiPhysX" since="V20_2_0_8">
@@ -5937,18 +5937,18 @@
 
     <niobject name="NiPhysXTransformDest" inherit="NiPhysXRigidBodyDest" module="NiPhysX" since="V20_2_0_8">
         Connects PhysX rigid body actors to a scene node.
-        <add name="Target" type="Ptr" template="NiAVObject" />
+        <field name="Target" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPhysXSrc" abstract="true" inherit="NiObject" module="NiPhysX" since="V20_2_0_8">
         A source is a link between a Gamebryo object and a PhysX actor.
-        <add name="Active" type="bool" default="1" />
-        <add name="Interpolate" type="bool" />
+        <field name="Active" type="bool" default="1" />
+        <field name="Interpolate" type="bool" />
     </niobject>
 
     <niobject name="NiPhysXRigidBodySrc" abstract="true" inherit="NiPhysXSrc" module="NiPhysX" since="V20_2_0_8">
         Sets state of a rigid body PhysX actor.
-        <add name="Source" type="Ptr" template="NiAVObject" />
+        <field name="Source" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPhysXKinematicSrc" inherit="NiPhysXRigidBodySrc" module="NiPhysX" since="V20_2_0_8">
@@ -5965,29 +5965,29 @@
 
     <niobject name="NiLinesData" inherit="NiGeometryData" module="NiMain">
         Wireframe geometry data.
-        <add name="Lines" type="bool" arr1="Num Vertices">Is vertex connected to other (next?) vertex?</add>
+        <field name="Lines" type="bool" arr1="Num Vertices">Is vertex connected to other (next?) vertex?</field>
     </niobject>
 
     <compound name="Polygon" size="8">
         Two dimensional screen elements.
-        <add name="Num Vertices" type="ushort" />
-        <add name="Vertex Offset" type="ushort">Offset in vertex array.</add>
-        <add name="Num Triangles" type="ushort" />
-        <add name="Triangle Offset" type="ushort">Offset in indices array.</add>
+        <field name="Num Vertices" type="ushort" />
+        <field name="Vertex Offset" type="ushort">Offset in vertex array.</field>
+        <field name="Num Triangles" type="ushort" />
+        <field name="Triangle Offset" type="ushort">Offset in indices array.</field>
     </compound>
 
     <niobject name="NiScreenElementsData" inherit="NiTriShapeData" module="NiMain">
         DEPRECATED (20.5), functionality included in NiMeshScreenElements.
         Two dimensional screen elements.
-        <add name="Max Polygons" type="ushort" />
-        <add name="Polygons" type="Polygon" arr1="Max Polygons" />
-        <add name="Polygon Indices" type="ushort" arr1="Max Polygons" />
-        <add name="Polygon Grow By" type="ushort" default="1" />
-        <add name="Num Polygons" type="ushort" />
-        <add name="Max Vertices" type="ushort" />
-        <add name="Vertices Grow By" type="ushort" default="1" />
-        <add name="Max Indices" type="ushort" />
-        <add name="Indices Grow By" type="ushort" default="1" />
+        <field name="Max Polygons" type="ushort" />
+        <field name="Polygons" type="Polygon" arr1="Max Polygons" />
+        <field name="Polygon Indices" type="ushort" arr1="Max Polygons" />
+        <field name="Polygon Grow By" type="ushort" default="1" />
+        <field name="Num Polygons" type="ushort" />
+        <field name="Max Vertices" type="ushort" />
+        <field name="Vertices Grow By" type="ushort" default="1" />
+        <field name="Max Indices" type="ushort" />
+        <field name="Indices Grow By" type="ushort" default="1" />
     </niobject>
 
     <niobject name="NiScreenElements" inherit="NiTriShape" module="NiMain">
@@ -5997,36 +5997,36 @@
 
     <niobject name="NiRoomGroup" inherit="NiNode" module="NiMain">
         NiRoomGroup represents a set of connected rooms i.e. a game level.
-        <add name="Shell" type="Ptr" template="NiNode">Object that represents the room group as seen from the outside.</add>
-        <add name="Num Rooms" type="uint" />
-        <add name="Rooms" type="Ptr" template="NiRoom" arr1="Num Rooms" />
+        <field name="Shell" type="Ptr" template="NiNode">Object that represents the room group as seen from the outside.</field>
+        <field name="Num Rooms" type="uint" />
+        <field name="Rooms" type="Ptr" template="NiRoom" arr1="Num Rooms" />
     </niobject>
 
     <niobject name="NiWall" inherit="NiNode" module="NiMain" until="V3_3_0_13">
-        <add name="Wall Plane" type="NiPlane" />
+        <field name="Wall Plane" type="NiPlane" />
     </niobject>
 
     <niobject name="NiRoom" inherit="NiNode" module="NiMain">
         NiRoom objects represent cells in a cell-portal culling system.
-        <add name="Num Walls" type="uint" />
-        <add name="Walls" type="Ref" template="NiWall" arr1="Num Walls" ver2="3.3.0.13" />
-        <add name="Wall Planes" type="NiPlane" arr1="Num Walls" ver1="4.0.0.0" />
-        <add name="Num In Portals" type="uint" />
-        <add name="In Portals" type="Ptr" template="NiPortal" arr1="Num In Portals">The portals which see into the room.</add>
-        <add name="Num Out Portals" type="uint" />
-        <add name="Out Portals" type="Ptr" template="NiPortal" arr1="Num Out Portals">The portals which see out of the room.</add>
-        <add name="Num Fixtures" type="uint" />
-        <add name="Fixtures" type="Ptr" template="NiAVObject" arr1="Num Fixtures">All geometry associated with the room. Seems to be Ref for legacy.</add>
+        <field name="Num Walls" type="uint" />
+        <field name="Walls" type="Ref" template="NiWall" arr1="Num Walls" ver2="3.3.0.13" />
+        <field name="Wall Planes" type="NiPlane" arr1="Num Walls" ver1="4.0.0.0" />
+        <field name="Num In Portals" type="uint" />
+        <field name="In Portals" type="Ptr" template="NiPortal" arr1="Num In Portals">The portals which see into the room.</field>
+        <field name="Num Out Portals" type="uint" />
+        <field name="Out Portals" type="Ptr" template="NiPortal" arr1="Num Out Portals">The portals which see out of the room.</field>
+        <field name="Num Fixtures" type="uint" />
+        <field name="Fixtures" type="Ptr" template="NiAVObject" arr1="Num Fixtures">All geometry associated with the room. Seems to be Ref for legacy.</field>
     </niobject>
 
     <niobject name="NiPortal" inherit="NiAVObject" module="NiMain">
         NiPortal objects are grouping nodes that support aggressive visibility culling.
         They represent flat polygonal regions through which a part of a scene graph can be viewed.
-        <add name="Portal Flags" type="ushort" />
-        <add name="Plane Count" type="ushort">Unused in 20.x, possibly also 10.x.</add>
-        <add name="Num Vertices" type="ushort" />
-        <add name="Vertices" type="Vector3" arr1="Num Vertices" />
-        <add name="Adjoiner" type="Ptr" template="NiNode">Root of the scenegraph which is to be seen through this portal.</add>
+        <field name="Portal Flags" type="ushort" />
+        <field name="Plane Count" type="ushort">Unused in 20.x, possibly also 10.x.</field>
+        <field name="Num Vertices" type="ushort" />
+        <field name="Vertices" type="Vector3" arr1="Num Vertices" />
+        <field name="Adjoiner" type="Ptr" template="NiNode">Root of the scenegraph which is to be seen through this portal.</field>
     </niobject>
 
     <niobject name="BSFadeNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
@@ -6119,61 +6119,61 @@
     
     <niobject name="BSShaderProperty" inherit="NiShadeProperty" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific property.
-        <add name="Shader Type" type="BSShaderType" default="SHADER_DEFAULT" vercond="#NI_BS_LTE_FO3#" />
-        <add name="Shader Flags" type="BSShaderFlags" default="0x82000000" vercond="#NI_BS_LTE_FO3#" />
-        <add name="Shader Flags 2" type="BSShaderFlags2" default="1" vercond="#NI_BS_LTE_FO3#" />
-        <add name="Environment Map Scale" type="float" default="1.0" range="#F0_10#" vercond="#NI_BS_LTE_FO3#">Scales the intensity of the environment/cube map.</add>
+        <field name="Shader Type" type="BSShaderType" default="SHADER_DEFAULT" vercond="#NI_BS_LTE_FO3#" />
+        <field name="Shader Flags" type="BSShaderFlags" default="0x82000000" vercond="#NI_BS_LTE_FO3#" />
+        <field name="Shader Flags 2" type="BSShaderFlags2" default="1" vercond="#NI_BS_LTE_FO3#" />
+        <field name="Environment Map Scale" type="float" default="1.0" range="#F0_10#" vercond="#NI_BS_LTE_FO3#">Scales the intensity of the environment/cube map.</field>
     </niobject>
 
     <niobject name="BSShaderLightingProperty" abstract="true" inherit="BSShaderProperty" module="BSMain" versions="#FO3#">
         Bethesda-specific property.
-        <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" vercond="#NI_BS_LTE_FO3#">How to handle texture borders.</add>
+        <field name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T" vercond="#NI_BS_LTE_FO3#">How to handle texture borders.</field>
     </niobject>
 
     <niobject name="BSShaderNoLightingProperty" inherit="BSShaderLightingProperty" module="BSMain" versions="#FO3#">
         Bethesda-specific property.
-        <add name="File Name" type="SizedString">The texture glow map.</add>
-        <add name="Falloff Start Angle" type="float" default="1.0" range="#F_NRM#" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
-        <add name="Falloff Stop Angle" type="float" default="0.0" range="#F_NRM#" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
-        <add name="Falloff Start Opacity" type="float" default="1.0" range="#F0_1#" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at start angle</add>
-        <add name="Falloff Stop Opacity" type="float" default="0.0" range="#F0_1#" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at end angle</add>
+        <field name="File Name" type="SizedString">The texture glow map.</field>
+        <field name="Falloff Start Angle" type="float" default="1.0" range="#F_NRM#" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Start Opacity</field>
+        <field name="Falloff Stop Angle" type="float" default="0.0" range="#F_NRM#" vercond="#BSVER# #GT# 26">At this cosine of angle falloff will be equal to Falloff Stop Opacity</field>
+        <field name="Falloff Start Opacity" type="float" default="1.0" range="#F0_1#" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at start angle</field>
+        <field name="Falloff Stop Opacity" type="float" default="0.0" range="#F0_1#" vercond="#BSVER# #GT# 26">Alpha falloff multiplier at end angle</field>
     </niobject>
 
     <niobject name="BSShaderPPLightingProperty" inherit="BSShaderLightingProperty" module="BSMain" versions="#FO3#">
         Bethesda-specific property.
-        <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set</add>
-        <add name="Refraction Strength" type="float" default="0.0" range="#F0_1#" vercond="#BSVER# #GT# 14">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</add>
-        <add name="Refraction Fire Period" type="int" default="0" range="#FPM_1000#" vercond="#BSVER# #GT# 14">Rate of texture movement for refraction shader.</add>
-        <add name="Parallax Max Passes" type="float" default="4.0" range="1.0:320.0" vercond="#BSVER# #GT# 24">The number of passes the parallax shader can apply.</add>
-        <add name="Parallax Scale" type="float" default="1.0" range="#F0_10#" vercond="#BSVER# #GT# 24">The strength of the parallax.</add>
+        <field name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set</field>
+        <field name="Refraction Strength" type="float" default="0.0" range="#F0_1#" vercond="#BSVER# #GT# 14">The amount of distortion. **Not based on physically accurate refractive index** (0=none) (0-1)</field>
+        <field name="Refraction Fire Period" type="int" default="0" range="#FPM_1000#" vercond="#BSVER# #GT# 14">Rate of texture movement for refraction shader.</field>
+        <field name="Parallax Max Passes" type="float" default="4.0" range="1.0:320.0" vercond="#BSVER# #GT# 24">The number of passes the parallax shader can apply.</field>
+        <field name="Parallax Scale" type="float" default="1.0" range="#F0_10#" vercond="#BSVER# #GT# 24">The strength of the parallax.</field>
         <!-- TODO: Find where this could have even come from as > 34 doesn't exist for this block. -->
-        <add name="Emissive Color" type="Color4" vercond="#BS_GT_FO3#">Glow color and alpha</add>
+        <field name="Emissive Color" type="Color4" vercond="#BS_GT_FO3#">Glow color and alpha</field>
     </niobject>
 
     <niobject name="BSEffectShaderPropertyFloatController" inherit="NiFloatInterpController" module="BSAnimation" versions="#SKY_AND_LATER#">
         This controller is used to animate float variables in BSEffectShaderProperty.
-        <add name="Controlled Variable" type="EffectShaderControlledVariable">Which float variable in BSEffectShaderProperty to animate.</add>
+        <field name="Controlled Variable" type="EffectShaderControlledVariable">Which float variable in BSEffectShaderProperty to animate.</field>
     </niobject>
 	
 	<niobject name="BSEffectShaderPropertyColorController" inherit="NiPoint3InterpController" module="BSAnimation" versions="#SKY_AND_LATER#">
 		This controller is used to animate colors in BSEffectShaderProperty.
-		<add name="Controlled Color" type="EffectShaderControlledColor">Which color in BSEffectShaderProperty to animate.</add>
+		<field name="Controlled Color" type="EffectShaderControlledColor">Which color in BSEffectShaderProperty to animate.</field>
 	</niobject>
 	
 	<niobject name="BSLightingShaderPropertyFloatController" inherit="NiFloatInterpController" module="BSAnimation" versions="#SKY_AND_LATER#">
 		This controller is used to animate float variables in BSLightingShaderProperty.
-		<add name="Controlled Variable" type="LightingShaderControlledFloat">Which float variable in BSLightingShaderProperty to animate.</add>
+		<field name="Controlled Variable" type="LightingShaderControlledFloat">Which float variable in BSLightingShaderProperty to animate.</field>
 	</niobject>
 
 	<niobject name="BSLightingShaderPropertyUShortController" inherit="NiFloatInterpController" module="BSAnimation" versions="#SKY_AND_LATER#">
 		This controller is used to animate float variables in BSLightingShaderProperty.
 		NOTE: FO4 CK reports this block as unsupported.
-		<add name="Controlled Variable" type="LightingShaderControlledUShort">NOTE: FO4 CK reports this as unsupported. Which integral variable in BSLightingShaderProperty to animate.</add>
+		<field name="Controlled Variable" type="LightingShaderControlledUShort">NOTE: FO4 CK reports this as unsupported. Which integral variable in BSLightingShaderProperty to animate.</field>
 	</niobject>
 
 	<niobject name="BSLightingShaderPropertyColorController" inherit="NiPoint3InterpController" module="BSAnimation" versions="#SKY_AND_LATER#">
 		This controller is used to animate colors in BSLightingShaderProperty.
-		<add name="Controlled Color" type="LightingShaderControlledColor">Which color in BSLightingShaderProperty to animate.</add>
+		<field name="Controlled Color" type="LightingShaderControlledColor">Which color in BSLightingShaderProperty to animate.</field>
 	</niobject>	
 	
 	<niobject name="BSNiAlphaPropertyTestRefController" inherit="NiFloatInterpController" module="BSAnimation" versions="#BETHESDA#" />
@@ -6181,33 +6181,33 @@
 	<niobject name="BSProceduralLightningController" inherit="NiTimeController" module="BSAnimation" versions="#BETHESDA#">
     Skyrim, Paired with dummy TriShapes, this controller generates lightning shapes for special effects.
     First interpolator controls Generation.
-        <add name="Interpolator 1: Generation" type="Ref" template="NiInterpolator">References generation interpolator.</add>
-		<add name="Interpolator 2: Mutation" type="Ref" template="NiInterpolator">References interpolator for Mutation of strips</add>
-        <add name="Interpolator 3: Subdivision" type="Ref" template="NiInterpolator">References subdivision interpolator.</add>
-        <add name="Interpolator 4: Num Branches" type="Ref" template="NiInterpolator">References branches interpolator.</add>
-        <add name="Interpolator 5: Num Branches Var" type="Ref" template="NiInterpolator">References branches variation interpolator.</add>
-        <add name="Interpolator 6: Length" type="Ref" template="NiInterpolator">References length interpolator.</add>
-        <add name="Interpolator 7: Length Var" type="Ref" template="NiInterpolator">References length variation interpolator.</add>
-        <add name="Interpolator 8: Width" type="Ref" template="NiInterpolator">References width interpolator.</add>
-        <add name="Interpolator 9: Arc Offset" type="Ref" template="NiInterpolator">References interpolator for amplitude control. 0=straight, 50=wide</add>
-        <add name="Subdivisions" type="ushort" default="6" range="0:12" />
-        <add name="Num Branches" type="ushort" default="1" range="0:10" />
-        <add name="Num Branches Variation" type="ushort" default="1" range="0:10" />
-        <add name="Length" type="float" default="512.0" range="#F0_10000#">How far lightning will stretch to.</add>
-        <add name="Length Variation" type="float" default="30.0" range="#F0_10000#">How far lightning variation will stretch to.</add>
-        <add name="Width" type="float" default="16.0" range="#F0_100#">How wide the bolt will be.</add>
-        <add name="Child Width Mult" type="float" default="0.75" range="#F0_10#">Influences forking behavior with a multiplier.</add>
-        <add name="Arc Offset" type="float" default="20.0" range="#F0_1000#" />
-        <add name="Fade Main Bolt" type="bool" default="1" />
-        <add name="Fade Child Bolts" type="bool" default="1" />
-        <add name="Animate Arc Offset" type="bool" default="1" />
-        <add name="Shader Property" type="Ref" template="BSShaderProperty">Reference to a shader property.</add>
+        <field name="Interpolator 1: Generation" type="Ref" template="NiInterpolator">References generation interpolator.</field>
+		<field name="Interpolator 2: Mutation" type="Ref" template="NiInterpolator">References interpolator for Mutation of strips</field>
+        <field name="Interpolator 3: Subdivision" type="Ref" template="NiInterpolator">References subdivision interpolator.</field>
+        <field name="Interpolator 4: Num Branches" type="Ref" template="NiInterpolator">References branches interpolator.</field>
+        <field name="Interpolator 5: Num Branches Var" type="Ref" template="NiInterpolator">References branches variation interpolator.</field>
+        <field name="Interpolator 6: Length" type="Ref" template="NiInterpolator">References length interpolator.</field>
+        <field name="Interpolator 7: Length Var" type="Ref" template="NiInterpolator">References length variation interpolator.</field>
+        <field name="Interpolator 8: Width" type="Ref" template="NiInterpolator">References width interpolator.</field>
+        <field name="Interpolator 9: Arc Offset" type="Ref" template="NiInterpolator">References interpolator for amplitude control. 0=straight, 50=wide</field>
+        <field name="Subdivisions" type="ushort" default="6" range="0:12" />
+        <field name="Num Branches" type="ushort" default="1" range="0:10" />
+        <field name="Num Branches Variation" type="ushort" default="1" range="0:10" />
+        <field name="Length" type="float" default="512.0" range="#F0_10000#">How far lightning will stretch to.</field>
+        <field name="Length Variation" type="float" default="30.0" range="#F0_10000#">How far lightning variation will stretch to.</field>
+        <field name="Width" type="float" default="16.0" range="#F0_100#">How wide the bolt will be.</field>
+        <field name="Child Width Mult" type="float" default="0.75" range="#F0_10#">Influences forking behavior with a multiplier.</field>
+        <field name="Arc Offset" type="float" default="20.0" range="#F0_1000#" />
+        <field name="Fade Main Bolt" type="bool" default="1" />
+        <field name="Fade Child Bolts" type="bool" default="1" />
+        <field name="Animate Arc Offset" type="bool" default="1" />
+        <field name="Shader Property" type="Ref" template="BSShaderProperty">Reference to a shader property.</field>
 	</niobject>
 
    <niobject name="BSShaderTextureSet" inherit="NiObject" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific Texture Set.
-        <add name="Num Textures" type="uint" default="6" />
-        <add name="Textures" type="SizedString" arr1="Num Textures">Textures.
+        <field name="Num Textures" type="uint" default="6" />
+        <field name="Textures" type="SizedString" arr1="Num Textures">Textures.
             0: Diffuse
             1: Normal/Gloss
             2: Glow(SLSF2_Glow_Map)/Skin/Hair/Rim light(SLSF2_Rim_Lighting)
@@ -6216,7 +6216,7 @@
             5: Environment Mask
             6: Subsurface for Multilayer Parallax
             7: Back Lighting Map (SLSF2_Back_Lighting)
-        </add>
+        </field>
     </niobject>
 
     <niobject name="WaterShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#FO3_AND_LATER#">
@@ -6234,13 +6234,13 @@
     </enum>
     <niobject name="SkyShaderProperty" inherit="BSShaderLightingProperty" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific property. Found in Fallout3
-        <add name="File Name" type="SizedString">The texture.</add>
-        <add name="Sky Object Type" type="SkyObjectType">Sky Object Type</add>
+        <field name="File Name" type="SizedString">The texture.</field>
+        <field name="Sky Object Type" type="SkyObjectType">Sky Object Type</field>
     </niobject>
 
     <niobject name="TileShaderProperty" inherit="BSShaderLightingProperty" module="BSMain" versions="#FO3#">
         Bethesda-specific property.
-        <add name="File Name" type="SizedString">Texture file name</add>
+        <field name="File Name" type="SizedString">Texture file name</field>
     </niobject>
 
     <niobject name="DistantLODShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#BETHESDA#">
@@ -6253,7 +6253,7 @@
 
     <niobject name="TallGrassShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific property.
-        <add name="File Name" type="SizedString">Texture file name</add>
+        <field name="File Name" type="SizedString">Texture file name</field>
     </niobject>
 
     <niobject name="VolumetricFogShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#FO3_AND_LATER#">
@@ -6413,8 +6413,8 @@
     </bitflags>
 
     <compound name="BSTextureArray" versions="#F76#">
-        <add name="Texture Array Width" type="uint" />
-        <add name="Texture Array" type="SizedString" arr1="Texture Array Width" />
+        <field name="Texture Array Width" type="uint" />
+        <field name="Texture Array" type="SizedString" arr1="Texture Array Width" />
     </compound>
 
     <enum name="BSShaderCRC32" storage="uint" prefix="SF" versions="#F76#">
@@ -6452,125 +6452,125 @@
     </enum>
 
     <compound name="BSSPWetnessParams" module="BSMain" versions="#FO4# #F76#">
-        <add name="Spec Scale" type="float" default="-1.0" />
-        <add name="Spec Power" type="float" default="-1.0" />
-        <add name="Min Var" type="float" default="-1.0" />
-        <add name="Env Map Scale" type="float" default="-1.0" vercond="#BS_FO4#" />
-        <add name="Fresnel Power" type="float" default="-1.0" />
-        <add name="Metalness" type="float" default="-1.0" />
-        <add name="Unknown 1" type="float" default="-1.0" vercond="#BS_F76#" />
-        <add name="Unknown 2" type="float" default="-1.0" vercond="#BS_F76#" />
+        <field name="Spec Scale" type="float" default="-1.0" />
+        <field name="Spec Power" type="float" default="-1.0" />
+        <field name="Min Var" type="float" default="-1.0" />
+        <field name="Env Map Scale" type="float" default="-1.0" vercond="#BS_FO4#" />
+        <field name="Fresnel Power" type="float" default="-1.0" />
+        <field name="Metalness" type="float" default="-1.0" />
+        <field name="Unknown 1" type="float" default="-1.0" vercond="#BS_F76#" />
+        <field name="Unknown 2" type="float" default="-1.0" vercond="#BS_F76#" />
     </compound>
 
     <compound name="BSSPLuminanceParams" module="BSMain" versions="#F76#">
-        <add name="Lum Emittance" type="float" default="100.0" range="#F_POS#" />
-        <add name="Exposure Offset" type="float" default="13.5" range="#F_POS#" />
-        <add name="Final Exposure Min" type="float" default="2.0" range="#F_POS#" />
-        <add name="Final Exposure Max" type="float" default="3.0" range="#F_POS#" />
+        <field name="Lum Emittance" type="float" default="100.0" range="#F_POS#" />
+        <field name="Exposure Offset" type="float" default="13.5" range="#F_POS#" />
+        <field name="Final Exposure Min" type="float" default="2.0" range="#F_POS#" />
+        <field name="Final Exposure Max" type="float" default="3.0" range="#F_POS#" />
     </compound>
 
     <compound name="BSSPTranslucencyParams" module="BSMain" versions="#F76#">
-        <add name="Subsurface Color" type="Color3" />
-        <add name="Transmissive Scale" type="float"/>
-        <add name="Turbulence" type="float" />
-        <add name="Thick Object" type="bool" />
-        <add name="Mix Albedo" type="bool" />
+        <field name="Subsurface Color" type="Color3" />
+        <field name="Transmissive Scale" type="float"/>
+        <field name="Turbulence" type="float" />
+        <field name="Thick Object" type="bool" />
+        <field name="Mix Albedo" type="bool" />
     </compound>
 
     <niobject name="BSLightingShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Bethesda shader property for Skyrim and later.
-        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="#NI_BS_LT_FO4#" default="0x82400301">Skyrim Shader Flags for setting render/shader options.</add>
-        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="#NI_BS_LT_FO4#" default="0x8021">Skyrim Shader Flags for setting render/shader options.</add>
-        <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" vercond="#BS_FO4#" default="0x80400201">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
-        <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" vercond="#BS_FO4#" default="1">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</add>
-        <add name="Shader Type" type="BSLightingShaderType155" vercond="#BS_F76#" />
-        <add name="Num SF1" type="uint" vercond="#BS_F76#" />
-        <add name="Num SF2" type="uint" vercond="#BS_F76#" />
-        <add name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
-        <add name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
-        <add name="UV Offset" type="TexCoord">Offset UVs</add>
-        <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
-        <add name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set, can have override in an esm/esp</add>
-        <add name="Emissive Color" type="Color3" default="#VEC3_ZERO#">Glow color and alpha</add>
-        <add name="Emissive Multiple" type="float" default="1.0" range="#F0_10#">Multiplied emissive colors</add>
-        <add name="Root Material" type="NiFixedString" vercond="#BS_GTE_FO4#" />
-        <add name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T">How to handle texture borders.</add>
-        <add name="Alpha" type="float" default="1.0" range="0.0:128.0">The material opacity (1=opaque). Greater than 1.0 is used to affect alpha falloff i.e. staying opaque longer based on vertex alpha and alpha mask.</add>
-        <add name="Refraction Strength" type="float" range="#F0_1#">The amount of distortion. **Not based on physically accurate refractive index** (0=none)</add>
-        <add name="Glossiness" type="float" default="80.0" range="#F0_999#" vercond="#NI_BS_LT_FO4#">The material specular power, or glossiness.</add>
-        <add name="Smoothness" type="float" default="1.0" range="#F0_1#" vercond="#BS_GTE_FO4#">The base roughness, multiplied by the smoothness map.</add>
-        <add name="Specular Color" type="Color3" default="#VEC3_ONE#">Adds a colored highlight.</add>
-        <add name="Specular Strength" type="float" default="1.0" range="#F0_10#">Brightness of specular highlight. (0=not visible)</add>
-        <add name="Lighting Effect 1" type="float" default="0.3" range="#F0_10#" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
-        <add name="Lighting Effect 2" type="float" default="2.0" range="#F0_1000#" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</add>
-        <add name="Subsurface Rolloff" type="float" default="0.0" range="#F0_10#" vercond="#BS_FO4#" />
-        <add name="Rimlight Power" type="float" default="#FLT_MAX#" vercond="#BS_FO4#" />
-        <add name="Backlight Power" type="float" range="#F0_1000#" cond="Rimlight Power == 0x7F7FFFFF" vercond="#BS_FO4#" />
-        <add name="Grayscale to Palette Scale" type="float" default="1.0" range="#F0_1#" vercond="#BS_GTE_FO4#" />
-        <add name="Fresnel Power" type="float" default="5.0" range="#F_PNZ#" vercond="#BS_GTE_FO4#" />
-        <add name="Wetness" type="BSSPWetnessParams" vercond="#BS_GTE_FO4#" />
-        <add name="Luminance" type="BSSPLuminanceParams" vercond="#BS_F76#" />
-        <add name="Do Translucency" type="bool" vercond="#BS_F76#" />
-        <add name="Translucency" type="BSSPTranslucencyParams" vercond="#BS_F76#" cond="Do Translucency" />
-        <add name="Has Texture Arrays" type="byte" vercond="#BS_F76#" />
-        <add name="Num Texture Arrays" type="uint" vercond="#BS_F76#" cond="Has Texture Arrays" />
-        <add name="Texture Arrays" type="BSTextureArray" arr1="Num Texture Arrays" vercond="#BS_F76#" cond="Has Texture Arrays" />
-        <add name="Environment Map Scale" type="float" default="1.0" range="#F0_10#" cond="Shader Type == 1" vercond="#NI_BS_LTE_FO4#">Scales the intensity of the environment/cube map.</add>
-        <add name="Use Screen Space Reflections" type="bool" cond="Shader Type == 1" vercond="#BS_FO4#" />
-        <add name="Wetness Control: Use SSR" type="bool" cond="Shader Type == 1" vercond="#BS_FO4#" />
-        <add name="Skin Tint Color" type="Color4" vercond="#BS_F76#" cond="Shader Type == 4" />
-        <add name="Hair Tint Color" type="Color3" vercond="#BS_F76#" cond="Shader Type == 5" />
-        <add name="Skin Tint Color" type="Color3" default="#VEC3_ONE#" vercond="#NI_BS_LTE_FO4#" cond="Shader Type == 5">Tints the base texture. Overridden by game settings.</add>
-        <add name="Skin Tint Alpha" type="float" default="1.0" vercond="#BS_FO4#" cond="Shader Type == 5" />
-        <add name="Hair Tint Color" type="Color3" default="#VEC3_ONE#" vercond="#NI_BS_LTE_FO4#" cond="Shader Type == 6">Tints the base texture. Overridden by game settings.</add>
-        <add name="Max Passes" type="float" default="4.0" range="1.0:320.0" cond="Shader Type == 7" />
-        <add name="Scale" type="float" default="1.0" range="#F0_10#" cond="Shader Type == 7" />
-        <add name="Parallax Inner Layer Thickness" type="float" default="5.0" range="5.0:500.0" cond="Shader Type == 11">How far from the surface the inner layer appears to be.</add>
-        <add name="Parallax Refraction Scale" type="float" default="0.25" range="#F0_1#" cond="Shader Type == 11">Depth of inner parallax layer effect.</add>
-        <add name="Parallax Inner Layer Texture Scale" type="TexCoord" cond="Shader Type == 11">Scales the inner parallax layer texture.</add>
-        <add name="Parallax Envmap Strength" type="float" default="1.0" range="#F0_10#" cond="Shader Type == 11">How strong the environment/cube map is.</add>
-        <add name="Sparkle Parameters" type="Vector4" cond="Shader Type == 14">CK lists "snow material" when used.</add>
-        <add name="Eye Cubemap Scale" type="float" default="1.3" range="#F0_10#" cond="Shader Type == 16">Eye cubemap scale</add>
-        <add name="Left Eye Reflection Center" type="Vector3" cond="Shader Type == 16">Offset to set center for left eye cubemap</add>
-        <add name="Right Eye Reflection Center" type="Vector3" cond="Shader Type == 16">Offset to set center for right eye cubemap</add>
+        <field name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" vercond="#NI_BS_LT_FO4#" default="0x82400301">Skyrim Shader Flags for setting render/shader options.</field>
+        <field name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" vercond="#NI_BS_LT_FO4#" default="0x8021">Skyrim Shader Flags for setting render/shader options.</field>
+        <field name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" vercond="#BS_FO4#" default="0x80400201">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</field>
+        <field name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" vercond="#BS_FO4#" default="1">Fallout 4 Shader Flags. Mostly overridden if "Name" is a path to a BGSM/BGEM file.</field>
+        <field name="Shader Type" type="BSLightingShaderType155" vercond="#BS_F76#" />
+        <field name="Num SF1" type="uint" vercond="#BS_F76#" />
+        <field name="Num SF2" type="uint" vercond="#BS_F76#" />
+        <field name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
+        <field name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
+        <field name="UV Offset" type="TexCoord">Offset UVs</field>
+        <field name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</field>
+        <field name="Texture Set" type="Ref" template="BSShaderTextureSet">Texture Set, can have override in an esm/esp</field>
+        <field name="Emissive Color" type="Color3" default="#VEC3_ZERO#">Glow color and alpha</field>
+        <field name="Emissive Multiple" type="float" default="1.0" range="#F0_10#">Multiplied emissive colors</field>
+        <field name="Root Material" type="NiFixedString" vercond="#BS_GTE_FO4#" />
+        <field name="Texture Clamp Mode" type="TexClampMode" default="WRAP_S_WRAP_T">How to handle texture borders.</field>
+        <field name="Alpha" type="float" default="1.0" range="0.0:128.0">The material opacity (1=opaque). Greater than 1.0 is used to affect alpha falloff i.e. staying opaque longer based on vertex alpha and alpha mask.</field>
+        <field name="Refraction Strength" type="float" range="#F0_1#">The amount of distortion. **Not based on physically accurate refractive index** (0=none)</field>
+        <field name="Glossiness" type="float" default="80.0" range="#F0_999#" vercond="#NI_BS_LT_FO4#">The material specular power, or glossiness.</field>
+        <field name="Smoothness" type="float" default="1.0" range="#F0_1#" vercond="#BS_GTE_FO4#">The base roughness, multiplied by the smoothness map.</field>
+        <field name="Specular Color" type="Color3" default="#VEC3_ONE#">Adds a colored highlight.</field>
+        <field name="Specular Strength" type="float" default="1.0" range="#F0_10#">Brightness of specular highlight. (0=not visible)</field>
+        <field name="Lighting Effect 1" type="float" default="0.3" range="#F0_10#" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</field>
+        <field name="Lighting Effect 2" type="float" default="2.0" range="#F0_1000#" vercond="#NI_BS_LT_FO4#">Controls strength for envmap/backlight/rim/softlight lighting effect?</field>
+        <field name="Subsurface Rolloff" type="float" default="0.0" range="#F0_10#" vercond="#BS_FO4#" />
+        <field name="Rimlight Power" type="float" default="#FLT_MAX#" vercond="#BS_FO4#" />
+        <field name="Backlight Power" type="float" range="#F0_1000#" cond="Rimlight Power == 0x7F7FFFFF" vercond="#BS_FO4#" />
+        <field name="Grayscale to Palette Scale" type="float" default="1.0" range="#F0_1#" vercond="#BS_GTE_FO4#" />
+        <field name="Fresnel Power" type="float" default="5.0" range="#F_PNZ#" vercond="#BS_GTE_FO4#" />
+        <field name="Wetness" type="BSSPWetnessParams" vercond="#BS_GTE_FO4#" />
+        <field name="Luminance" type="BSSPLuminanceParams" vercond="#BS_F76#" />
+        <field name="Do Translucency" type="bool" vercond="#BS_F76#" />
+        <field name="Translucency" type="BSSPTranslucencyParams" vercond="#BS_F76#" cond="Do Translucency" />
+        <field name="Has Texture Arrays" type="byte" vercond="#BS_F76#" />
+        <field name="Num Texture Arrays" type="uint" vercond="#BS_F76#" cond="Has Texture Arrays" />
+        <field name="Texture Arrays" type="BSTextureArray" arr1="Num Texture Arrays" vercond="#BS_F76#" cond="Has Texture Arrays" />
+        <field name="Environment Map Scale" type="float" default="1.0" range="#F0_10#" cond="Shader Type == 1" vercond="#NI_BS_LTE_FO4#">Scales the intensity of the environment/cube map.</field>
+        <field name="Use Screen Space Reflections" type="bool" cond="Shader Type == 1" vercond="#BS_FO4#" />
+        <field name="Wetness Control: Use SSR" type="bool" cond="Shader Type == 1" vercond="#BS_FO4#" />
+        <field name="Skin Tint Color" type="Color4" vercond="#BS_F76#" cond="Shader Type == 4" />
+        <field name="Hair Tint Color" type="Color3" vercond="#BS_F76#" cond="Shader Type == 5" />
+        <field name="Skin Tint Color" type="Color3" default="#VEC3_ONE#" vercond="#NI_BS_LTE_FO4#" cond="Shader Type == 5">Tints the base texture. Overridden by game settings.</field>
+        <field name="Skin Tint Alpha" type="float" default="1.0" vercond="#BS_FO4#" cond="Shader Type == 5" />
+        <field name="Hair Tint Color" type="Color3" default="#VEC3_ONE#" vercond="#NI_BS_LTE_FO4#" cond="Shader Type == 6">Tints the base texture. Overridden by game settings.</field>
+        <field name="Max Passes" type="float" default="4.0" range="1.0:320.0" cond="Shader Type == 7" />
+        <field name="Scale" type="float" default="1.0" range="#F0_10#" cond="Shader Type == 7" />
+        <field name="Parallax Inner Layer Thickness" type="float" default="5.0" range="5.0:500.0" cond="Shader Type == 11">How far from the surface the inner layer appears to be.</field>
+        <field name="Parallax Refraction Scale" type="float" default="0.25" range="#F0_1#" cond="Shader Type == 11">Depth of inner parallax layer effect.</field>
+        <field name="Parallax Inner Layer Texture Scale" type="TexCoord" cond="Shader Type == 11">Scales the inner parallax layer texture.</field>
+        <field name="Parallax Envmap Strength" type="float" default="1.0" range="#F0_10#" cond="Shader Type == 11">How strong the environment/cube map is.</field>
+        <field name="Sparkle Parameters" type="Vector4" cond="Shader Type == 14">CK lists "snow material" when used.</field>
+        <field name="Eye Cubemap Scale" type="float" default="1.3" range="#F0_10#" cond="Shader Type == 16">Eye cubemap scale</field>
+        <field name="Left Eye Reflection Center" type="Vector3" cond="Shader Type == 16">Offset to set center for left eye cubemap</field>
+        <field name="Right Eye Reflection Center" type="Vector3" cond="Shader Type == 16">Offset to set center for right eye cubemap</field>
     </niobject>
 
     <niobject name="BSEffectShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Bethesda effect shader property for Skyrim and later.
-        <add name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="0x80000000" vercond="#NI_BS_LT_FO4#" />
-        <add name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="0x20" vercond="#NI_BS_LT_FO4#" />
-        <add name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" default="0x80000000" vercond="#BS_FO4#" />
-        <add name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" default="0x20" vercond="#BS_FO4#" />
-        <add name="Num SF1" type="uint" vercond="#BS_F76#" />
-        <add name="Num SF2" type="uint" vercond="#BS_F76#" />
-        <add name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
-        <add name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
-        <add name="UV Offset" type="TexCoord">Offset UVs</add>
-        <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures</add>
-        <add name="Source Texture"  type="SizedString">points to an external texture.</add>
+        <field name="Shader Flags 1" suffix="SK" type="SkyrimShaderPropertyFlags1" default="0x80000000" vercond="#NI_BS_LT_FO4#" />
+        <field name="Shader Flags 2" suffix="SK" type="SkyrimShaderPropertyFlags2" default="0x20" vercond="#NI_BS_LT_FO4#" />
+        <field name="Shader Flags 1" suffix="FO4" type="Fallout4ShaderPropertyFlags1" default="0x80000000" vercond="#BS_FO4#" />
+        <field name="Shader Flags 2" suffix="FO4" type="Fallout4ShaderPropertyFlags2" default="0x20" vercond="#BS_FO4#" />
+        <field name="Num SF1" type="uint" vercond="#BS_F76#" />
+        <field name="Num SF2" type="uint" vercond="#BS_F76#" />
+        <field name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
+        <field name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
+        <field name="UV Offset" type="TexCoord">Offset UVs</field>
+        <field name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures</field>
+        <field name="Source Texture"  type="SizedString">points to an external texture.</field>
         <!-- TODO: Next 4 bytes requires bitfield, read as single int -->
-        <add name="Texture Clamp Mode" type="byte" default="3">How to handle texture borders.</add>
-        <add name="Lighting Influence" type="byte" default="255" />
-        <add name="Env Map Min LOD" type="byte" range="0:16" />
-        <add name="Unused Byte" type="byte" />
-        <add name="Falloff Start Angle" type="float" default="1.0" range="#F_NRM#">At this cosine of angle falloff will be equal to Falloff Start Opacity</add>
-        <add name="Falloff Stop Angle" type="float" default="1.0" range="#F_NRM#">At this cosine of angle falloff will be equal to Falloff Stop Opacity</add>
-        <add name="Falloff Start Opacity" type="float" range="#F0_1#">Alpha falloff multiplier at start angle</add>
-        <add name="Falloff Stop Opacity" type="float" range="#F0_1#">Alpha falloff multiplier at end angle</add>
-        <add name="Refraction Power" type="float" vercond="#BS_F76#" />
-        <add name="Base Color" type="Color4" default="#VEC4_ONE#">Base color</add>
-        <add name="Base Color Scale" type="float" default="1.0" range="0.0:360.0">Multiplier for Base Color (RGB part)</add>
-        <add name="Soft Falloff Depth" type="float" default="100.0" range="0.0:9999.0" />
-        <add name="Greyscale Texture"  type="SizedString">Points to an external texture, used as palette for SLSF1_Greyscale_To_PaletteColor/SLSF1_Greyscale_To_PaletteAlpha.</add>
-        <add name="Env Map Texture" type="SizedString" vercond="#BS_GTE_FO4#" />
-        <add name="Normal Texture" type="SizedString" vercond="#BS_GTE_FO4#" />
-        <add name="Env Mask Texture" type="SizedString" vercond="#BS_GTE_FO4#" />
-        <add name="Environment Map Scale" type="float" default="1.0" range="0.01:20.0" vercond="#BS_GTE_FO4#" />
-        <add name="Reflectance Texture" type="SizedString" vercond="#BS_F76#" />
-        <add name="Lighting Texture" type="SizedString" vercond="#BS_F76#" />
-        <add name="Emittance Color" type="Color3" vercond="#BS_F76#" />
-        <add name="Emit Gradient Texture" type="SizedString" vercond="#BS_F76#" />
-        <add name="Luminance" type="BSSPLuminanceParams" vercond="#BS_F76#" />
+        <field name="Texture Clamp Mode" type="byte" default="3">How to handle texture borders.</field>
+        <field name="Lighting Influence" type="byte" default="255" />
+        <field name="Env Map Min LOD" type="byte" range="0:16" />
+        <field name="Unused Byte" type="byte" />
+        <field name="Falloff Start Angle" type="float" default="1.0" range="#F_NRM#">At this cosine of angle falloff will be equal to Falloff Start Opacity</field>
+        <field name="Falloff Stop Angle" type="float" default="1.0" range="#F_NRM#">At this cosine of angle falloff will be equal to Falloff Stop Opacity</field>
+        <field name="Falloff Start Opacity" type="float" range="#F0_1#">Alpha falloff multiplier at start angle</field>
+        <field name="Falloff Stop Opacity" type="float" range="#F0_1#">Alpha falloff multiplier at end angle</field>
+        <field name="Refraction Power" type="float" vercond="#BS_F76#" />
+        <field name="Base Color" type="Color4" default="#VEC4_ONE#">Base color</field>
+        <field name="Base Color Scale" type="float" default="1.0" range="0.0:360.0">Multiplier for Base Color (RGB part)</field>
+        <field name="Soft Falloff Depth" type="float" default="100.0" range="0.0:9999.0" />
+        <field name="Greyscale Texture"  type="SizedString">Points to an external texture, used as palette for SLSF1_Greyscale_To_PaletteColor/SLSF1_Greyscale_To_PaletteAlpha.</field>
+        <field name="Env Map Texture" type="SizedString" vercond="#BS_GTE_FO4#" />
+        <field name="Normal Texture" type="SizedString" vercond="#BS_GTE_FO4#" />
+        <field name="Env Mask Texture" type="SizedString" vercond="#BS_GTE_FO4#" />
+        <field name="Environment Map Scale" type="float" default="1.0" range="0.01:20.0" vercond="#BS_GTE_FO4#" />
+        <field name="Reflectance Texture" type="SizedString" vercond="#BS_F76#" />
+        <field name="Lighting Texture" type="SizedString" vercond="#BS_F76#" />
+        <field name="Emittance Color" type="Color3" vercond="#BS_F76#" />
+        <field name="Emit Gradient Texture" type="SizedString" vercond="#BS_F76#" />
+        <field name="Luminance" type="BSSPLuminanceParams" vercond="#BS_F76#" />
     </niobject>
     
     <bitflags name="WaterShaderPropertyFlags" storage="uint" prefix="BSWSP" versions="#SKY_AND_LATER#">
@@ -6593,53 +6593,53 @@
     
     <niobject name="BSWaterShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Skyrim water shader property, different from "WaterShaderProperty" seen in Fallout.
-        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000008" vercond="!#BS_F76#" />
-        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" vercond="!#BS_F76#" />
-        <add name="Num SF1" type="uint" vercond="#BS_F76#" />
-        <add name="Num SF2" type="uint" vercond="#BS_F76#" />
-        <add name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
-        <add name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
-        <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
-        <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
-        <add name="Water Shader Flags" type="WaterShaderPropertyFlags" default="0xC4" />
+        <field name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000008" vercond="!#BS_F76#" />
+        <field name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" vercond="!#BS_F76#" />
+        <field name="Num SF1" type="uint" vercond="#BS_F76#" />
+        <field name="Num SF2" type="uint" vercond="#BS_F76#" />
+        <field name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
+        <field name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
+        <field name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</field>
+        <field name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</field>
+        <field name="Water Shader Flags" type="WaterShaderPropertyFlags" default="0xC4" />
     </niobject>
     
     <niobject name="BSSkyShaderProperty" inherit="BSShaderProperty" module="BSMain" versions="#SKY_AND_LATER#">
         Skyrim Sky shader block.
-        <add name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000000" vercond="!#BS_F76#" />
-        <add name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" vercond="!#BS_F76#" />
-        <add name="Num SF1" type="uint" vercond="#BS_F76#" />
-        <add name="Num SF2" type="uint" vercond="#BS_F76#" />
-        <add name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
-        <add name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
-        <add name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</add>
-        <add name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</add>
-        <add name="Source Texture" type="SizedString">points to an external texture.</add>
-        <add name="Sky Object Type" type="SkyObjectType" default="BSSM_SKY_CLOUDS" />
+        <field name="Shader Flags 1" type="SkyrimShaderPropertyFlags1" default="0x80000000" vercond="!#BS_F76#" />
+        <field name="Shader Flags 2" type="SkyrimShaderPropertyFlags2" default="0x21" vercond="!#BS_F76#" />
+        <field name="Num SF1" type="uint" vercond="#BS_F76#" />
+        <field name="Num SF2" type="uint" vercond="#BS_F76#" />
+        <field name="SF1" type="BSShaderCRC32" arr1="Num SF1" vercond="#BS_F76#" />
+        <field name="SF2" type="BSShaderCRC32" arr1="Num SF2" vercond="#BS_F76#" />
+        <field name="UV Offset" type="TexCoord">Offset UVs. Seems to be unused, but it fits with the other Skyrim shader properties.</field>
+        <field name="UV Scale" type="TexCoord" default="#VEC2_ONE#">Offset UV Scale to repeat tiling textures, see above.</field>
+        <field name="Source Texture" type="SizedString">points to an external texture.</field>
+        <field name="Sky Object Type" type="SkyObjectType" default="BSSM_SKY_CLOUDS" />
     </niobject>
 
     <niobject name="BSDismemberSkinInstance" inherit="NiSkinInstance" module="BSMain" versions="#BETHESDA#">
         Bethesda-specific skin instance.
-        <add name="Num Partitions" type="uint" default="1" />
-        <add name="Partitions" type="BodyPartList" arr1="Num Partitions" />
+        <field name="Num Partitions" type="uint" default="1" />
+        <field name="Partitions" type="BodyPartList" arr1="Num Partitions" />
     </niobject>
 
     <niobject name="BSDecalPlacementVectorExtraData" inherit="NiFloatExtraData" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific extra data. Lists locations and normals on a mesh that are appropriate for decal placement.
-        <add name="Num Vector Blocks" type="ushort" />
-        <add name="Vector Blocks" type="DecalVectorArray" arr1="Num Vector Blocks" />
+        <field name="Num Vector Blocks" type="ushort" />
+        <field name="Vector Blocks" type="DecalVectorArray" arr1="Num Vector Blocks" />
     </niobject>
 
     <niobject name="BSPSysSimpleColorModifier" inherit="NiPSysModifier" module="BSParticle" versions="#FO3_AND_LATER#">
         Bethesda-specific particle modifier.
-        <add name="Fade In Percent" type="float" default="0.1" range="#F0_1#" />
-        <add name="Fade Out Percent" type="float" default="0.9" range="#F0_1#" />
-        <add name="Color 1 End Percent" type="float" range="#F0_1#" />
-        <add name="Color 1 Start Percent" type="float" range="#F0_1#" />
-        <add name="Color 2 End Percent" type="float" range="#F0_1#" />
-        <add name="Color 2 Start Percent" type="float" default="1.0" range="#F0_1#" />
-        <add name="Colors" type="Color4" arr1="3" />
-        <add name="Unknown Shorts" type="ushort" arr1="26" vercond="#BS_F76#" />
+        <field name="Fade In Percent" type="float" default="0.1" range="#F0_1#" />
+        <field name="Fade Out Percent" type="float" default="0.9" range="#F0_1#" />
+        <field name="Color 1 End Percent" type="float" range="#F0_1#" />
+        <field name="Color 1 Start Percent" type="float" range="#F0_1#" />
+        <field name="Color 2 End Percent" type="float" range="#F0_1#" />
+        <field name="Color 2 Start Percent" type="float" default="1.0" range="#F0_1#" />
+        <field name="Colors" type="Color4" arr1="3" />
+        <field name="Unknown Shorts" type="ushort" arr1="26" vercond="#BS_F76#" />
     </niobject>
 
 
@@ -6651,8 +6651,8 @@
 
     <niobject name="BSValueNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific node. Found on fxFire effects
-        <add name="Value" type="uint" />
-        <add name="Value Node Flags" type="BSValueNodeFlags" />
+        <field name="Value" type="uint" />
+        <field name="Value Node Flags" type="BSValueNodeFlags" />
     </niobject>
 
 
@@ -6663,16 +6663,16 @@
 
     <niobject name="BSStripPSysData" inherit="NiPSysData" module="BSParticle" versions="#FO3_AND_LATER#">
         Bethesda-Specific (mesh?) Particle System Data.
-        <add name="Max Point Count" type="ushort" />
-        <add name="Start Cap Size" type="float" />
-        <add name="End Cap Size" type="float" />
-        <add name="Do Z Prepass" type="bool" />
+        <field name="Max Point Count" type="ushort" />
+        <field name="Start Cap Size" type="float" />
+        <field name="End Cap Size" type="float" />
+        <field name="Do Z Prepass" type="bool" />
     </niobject>
 
 
     <niobject name="BSPSysStripUpdateModifier" inherit="NiPSysModifier" module="BSParticle" versions="#FO3_AND_LATER#">
         Bethesda-Specific (mesh?) Particle System Modifier.
-        <add name="Update Delta Time" type="float" default="0.033333" />
+        <field name="Update Delta Time" type="float" default="0.033333" />
     </niobject>
 
 
@@ -6684,17 +6684,17 @@
 
     <niobject name="BSMasterParticleSystem" inherit="NiNode" module="BSParticle" versions="#FO3_AND_LATER#">
         Bethesda-Specific particle system.
-        <add name="Max Emitter Objects" type="ushort" default="20" />
-        <add name="Num Particle Systems" type="uint" />
-        <add name="Particle Systems" type="Ref" template="NiAVObject" arr1="Num Particle Systems" />
+        <field name="Max Emitter Objects" type="ushort" default="20" />
+        <field name="Num Particle Systems" type="uint" />
+        <field name="Particle Systems" type="Ref" template="NiAVObject" arr1="Num Particle Systems" />
 
     </niobject>
 
 
     <niobject name="BSPSysMultiTargetEmitterCtlr" inherit="NiPSysEmitterCtlr" module="BSParticle" versions="#FO3_AND_LATER#">
         Particle system (multi?) emitter controller.
-        <add name="Max Emitters" type="ushort" />
-        <add name="Master Particle System" type="Ptr" template="BSMasterParticleSystem" />
+        <field name="Max Emitters" type="ushort" />
+        <field name="Master Particle System" type="Ptr" template="BSMasterParticleSystem" />
     </niobject>
 
 
@@ -6705,16 +6705,16 @@
 
     <niobject name="BSOrderedNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
-        <add name="Alpha Sort Bound" type="Vector4" />
-        <add name="Static Bound" type="bool" default="1" />
+        <field name="Alpha Sort Bound" type="Vector4" />
+        <field name="Static Bound" type="bool" default="1" />
     </niobject>
 
 
     <niobject name="BSRangeNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-Specific node.
-        <add name="Min" type="byte" />
-        <add name="Max" type="byte" />
-        <add name="Current" type="byte" />
+        <field name="Min" type="byte" />
+        <field name="Max" type="byte" />
+        <field name="Current" type="byte" />
     </niobject>
 
     <niobject name="BSBlastNode" inherit="BSRangeNode" module="BSMain" versions="#FO3_AND_LATER#">
@@ -6728,7 +6728,7 @@
 
     <niobject name="BSRefractionFirePeriodController" inherit="NiTimeController" module="BSAnimation" versions="#FO3#">
         Bethesda-specific time controller.
-        <add name="Interpolator" type="Ref" template="NiInterpolator" />
+        <field name="Interpolator" type="Ref" template="NiInterpolator" />
     </niobject>
 
     <niobject name="bhkConvexListShape" inherit="bhkConvexShapeBase" module="BSHavok" versions="#FO3#">
@@ -6742,29 +6742,29 @@
         as their Radius values differ in function. (Sphere/Capsule radius = physical size, CVS radius = padding/shell)
         
         Shapes collected in a bhkConvexListShape may not have the correct material noise.
-        <add name="Num Sub Shapes" type="uint" default="1" range="1:255" />
-        <add name="Sub Shapes" type="Ref" template="bhkConvexShapeBase" arr1="Num Sub Shapes">List of shapes. Max of 255.</add>
-        <add name="Material" type="HavokMaterial">The material of the shape.</add>
-        <add name="Radius" type="float" />
-        <add name="Unknown Int 1" type="uint" />
-        <add name="Unknown Float 1" type="float" />
-        <add name="Child Shape Property" type="bhkWorldObjCInfoProperty" />
-        <add name="Use Cached AABB" type="bool">If true, an AABB of the children's AABBs is used, which is faster but larger than building an AABB from each child.</add>
-        <add name="Closest Point Min Distance" type="float">A distance which is used for getClosestPoint(). If the object being tested is closer, the children are recursed. Otherwise it returns this value.</add>
+        <field name="Num Sub Shapes" type="uint" default="1" range="1:255" />
+        <field name="Sub Shapes" type="Ref" template="bhkConvexShapeBase" arr1="Num Sub Shapes">List of shapes. Max of 255.</field>
+        <field name="Material" type="HavokMaterial">The material of the shape.</field>
+        <field name="Radius" type="float" />
+        <field name="Unknown Int 1" type="uint" />
+        <field name="Unknown Float 1" type="float" />
+        <field name="Child Shape Property" type="bhkWorldObjCInfoProperty" />
+        <field name="Use Cached AABB" type="bool">If true, an AABB of the children's AABBs is used, which is faster but larger than building an AABB from each child.</field>
+        <field name="Closest Point Min Distance" type="float">A distance which is used for getClosestPoint(). If the object being tested is closer, the children are recursed. Otherwise it returns this value.</field>
     </niobject>
 
     <compound name="BSTreadTransform" size="68" versions="#FO3_AND_LATER#">
         Bethesda-specific compound.
-        <add name="Name" type="NiFixedString" />
-        <add name="Transform 1" type="NiQuatTransform" />
-        <add name="Transform 2" type="NiQuatTransform" />
+        <field name="Name" type="NiFixedString" />
+        <field name="Transform 1" type="NiQuatTransform" />
+        <field name="Transform 2" type="NiQuatTransform" />
     </compound>
 
     <niobject name="BSTreadTransfInterpolator" inherit="NiInterpolator" module="BSAnimation" versions="#FO3_AND_LATER#">
         Bethesda-specific interpolator.
-        <add name="Num Tread Transforms" type="uint" />
-        <add name="Tread Transforms" type="BSTreadTransform" arr1="Num Tread Transforms" />
-        <add name="Data" type="Ref" template="NiFloatData" />
+        <field name="Num Tread Transforms" type="uint" />
+        <field name="Tread Transforms" type="BSTreadTransform" arr1="Num Tread Transforms" />
+        <field name="Data" type="Ref" template="NiFloatData" />
     </niobject>
 
     <enum name="AnimNoteType" storage="uint" versions="#FO3_AND_LATER#">
@@ -6776,26 +6776,26 @@
 
     <niobject name="BSAnimNote" inherit="NiObject" module="BSAnimation" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
-        <add name="Type" type="AnimNoteType">Type of this note.</add>
-        <add name="Time" type="float">Location in time.</add>
-        <add name="Arm" type="uint" cond="Type == 1" />
-        <add name="Gain" type="float" cond="Type == 2" />
-        <add name="State" type="uint" cond="Type == 2" />
+        <field name="Type" type="AnimNoteType">Type of this note.</field>
+        <field name="Time" type="float">Location in time.</field>
+        <field name="Arm" type="uint" cond="Type == 1" />
+        <field name="Gain" type="float" cond="Type == 2" />
+        <field name="State" type="uint" cond="Type == 2" />
     </niobject>
 
     <niobject name="BSAnimNotes" inherit="NiObject" module="BSAnimation" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
-        <add name="Num Anim Notes" type="ushort">Number of BSAnimNote objects.</add>
-        <add name="Anim Notes" type="Ref" template="BSAnimNote" arr1="Num Anim Notes">BSAnimNote objects.</add>
+        <field name="Num Anim Notes" type="ushort">Number of BSAnimNote objects.</field>
+        <field name="Anim Notes" type="Ref" template="BSAnimNote" arr1="Num Anim Notes">BSAnimNote objects.</field>
     </niobject>
 
     <niobject name="bhkLiquidAction" inherit="bhkAction" module="BSHavok" versions="#FO3_AND_LATER#">
         Bethesda custom bhkUnaryAction. Does not hold a link to the body like other bhkUnaryActions however.
-        <add name="Unused 01" type="byte" arr1="12" binary="true" />
-        <add name="Initial Stick Force" type="float" default="25.0" />
-        <add name="Stick Strength" type="float" default="100.0" />
-        <add name="Neighbor Distance" type="float" default="128.0" />
-        <add name="Neighbor Strength" type="float" default="500.0" />
+        <field name="Unused 01" type="byte" arr1="12" binary="true" />
+        <field name="Initial Stick Force" type="float" default="25.0" />
+        <field name="Stick Strength" type="float" default="100.0" />
+        <field name="Neighbor Distance" type="float" default="128.0" />
+        <field name="Neighbor Strength" type="float" default="500.0" />
     </niobject>
 
     <enum name="BSCPCullingType" storage="uint" prefix="BSCP" versions="#FO3_AND_LATER#">
@@ -6809,13 +6809,13 @@
 
     <niobject name="BSMultiBoundNode" inherit="NiNode" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific node.
-        <add name="Multi Bound" type="Ref" template="BSMultiBound" />
-		<add name="Culling Mode" type="BSCPCullingType" default="CULL_ALLPASS" vercond="#BS_GTE_SKY#" />
+        <field name="Multi Bound" type="Ref" template="BSMultiBound" />
+		<field name="Culling Mode" type="BSCPCullingType" default="CULL_ALLPASS" vercond="#BS_GTE_SKY#" />
     </niobject>
 
     <niobject name="BSMultiBound" inherit="NiObject" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
-        <add name="Data" type="Ref" template="BSMultiBoundData" />
+        <field name="Data" type="Ref" template="BSMultiBoundData" />
     </niobject>
 
     <niobject name="BSMultiBoundData" inherit="NiObject" module="BSMain" versions="#FO3_AND_LATER#">
@@ -6824,95 +6824,95 @@
 
     <niobject name="BSMultiBoundOBB" inherit="BSMultiBoundData" module="BSMain" versions="#FO3_AND_LATER#">
         Oriented bounding box.
-        <add name="Center" type="Vector3">Center of the box.</add>
-        <add name="Size" type="Vector3">Size of the box along each axis.</add>
-        <add name="Rotation" type="Matrix33">Rotation of the bounding box.</add>
+        <field name="Center" type="Vector3">Center of the box.</field>
+        <field name="Size" type="Vector3">Size of the box along each axis.</field>
+        <field name="Rotation" type="Matrix33">Rotation of the bounding box.</field>
     </niobject>
     
     <niobject name="BSMultiBoundSphere" inherit="BSMultiBoundData" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
-        <add name="Center" type="Vector3" />
-        <add name="Radius" type="float" />
+        <field name="Center" type="Vector3" />
+        <field name="Radius" type="float" />
     </niobject>
 
     <compound name="BSGeometrySubSegment" size="16" versions="#FO3_AND_LATER#">
         This is only defined because of recursion issues.
-        <add name="Start Index" type="uint" />
-        <add name="Num Primitives" type="uint" />
-        <add name="Parent Array Index" type="uint" />
-        <add name="Unused" type="uint" />
+        <field name="Start Index" type="uint" />
+        <field name="Num Primitives" type="uint" />
+        <field name="Parent Array Index" type="uint" />
+        <field name="Unused" type="uint" />
     </compound>
 
     <compound name="BSGeometrySegmentData" versions="#FO3_AND_LATER#">
         Bethesda-specific. Describes groups of triangles either segmented in a grid (for LOD) or by body part for skinned FO4 meshes.
-        <add name="Flags" type="byte" vercond="#NI_BS_LT_FO4#" />
-        <add name="Start Index" type="uint">Index = previous Index + previous Num Tris in Segment * 3</add>
-        <add name="Num Primitives" type="uint">The number of triangles belonging to this segment</add>
-        <add name="Parent Array Index" type="uint" vercond="#BS_GTE_FO4#" />
-        <add name="Num Sub Segments" type="uint" vercond="#BS_GTE_FO4#" />
-        <add name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="#BS_GTE_FO4#" />
+        <field name="Flags" type="byte" vercond="#NI_BS_LT_FO4#" />
+        <field name="Start Index" type="uint">Index = previous Index + previous Num Tris in Segment * 3</field>
+        <field name="Num Primitives" type="uint">The number of triangles belonging to this segment</field>
+        <field name="Parent Array Index" type="uint" vercond="#BS_GTE_FO4#" />
+        <field name="Num Sub Segments" type="uint" vercond="#BS_GTE_FO4#" />
+        <field name="Sub Segment" type="BSGeometrySubSegment" arr1="Num Sub Segments" vercond="#BS_GTE_FO4#" />
     </compound>
 
     <niobject name="BSSegmentedTriShape" inherit="NiTriShape" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific AV object.
-        <add name="Num Segments" type="uint" default="16">Number of segments in the square grid</add>
-        <add name="Segment" type="BSGeometrySegmentData" arr1="Num Segments">Configuration of each segment</add>
+        <field name="Num Segments" type="uint" default="16">Number of segments in the square grid</field>
+        <field name="Segment" type="BSGeometrySegmentData" arr1="Num Segments">Configuration of each segment</field>
     </niobject>
 
     <niobject name="BSMultiBoundAABB" inherit="BSMultiBoundData" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific object.
-        <add name="Position" type="Vector3">Position of the AABB's center</add>
-        <add name="Extent" type="Vector3">Extent of the AABB in all directions</add>
+        <field name="Position" type="Vector3">Position of the AABB's center</field>
+        <field name="Extent" type="Vector3">Extent of the AABB in all directions</field>
     </niobject>
 
     <compound name="NiAGDDataStream">
-        <add name="Type" type="uint">Type of data in this channel</add>
-        <add name="Unit Size" type="uint">Number of bytes per element of this channel</add>
-        <add name="Total Size" type="uint">Total number of bytes of this channel (num vertices times num bytes per element)</add>
-        <add name="Stride" type="uint">Number of bytes per element in all channels together. Sum of num channel bytes per element over all block infos.</add>
-        <add name="Block Index" type="uint">Unsure. The block in which this channel is stored? Usually there is only one block, and so this is zero.</add>
-        <add name="Block Offset" type="uint">Offset (in bytes) of this channel. Sum of all num channel bytes per element of all preceeding block infos.</add>
-        <add name="Flags" type="NiAGDDataStreamFlags" default="2" />
+        <field name="Type" type="uint">Type of data in this channel</field>
+        <field name="Unit Size" type="uint">Number of bytes per element of this channel</field>
+        <field name="Total Size" type="uint">Total number of bytes of this channel (num vertices times num bytes per element)</field>
+        <field name="Stride" type="uint">Number of bytes per element in all channels together. Sum of num channel bytes per element over all block infos.</field>
+        <field name="Block Index" type="uint">Unsure. The block in which this channel is stored? Usually there is only one block, and so this is zero.</field>
+        <field name="Block Offset" type="uint">Offset (in bytes) of this channel. Sum of all num channel bytes per element of all preceeding block infos.</field>
+        <field name="Flags" type="NiAGDDataStreamFlags" default="2" />
     </compound>
 
     <compound name="NiAGDDataBlock">
-        <add name="Block Size" type="uint" />
-        <add name="Num Blocks" type="uint" />
-        <add name="Block Offsets" type="uint" arr1="Num Blocks" />
-        <add name="Num Data" type="uint" />
-        <add name="Data Sizes" type="uint" arr1="Num Data" />
-        <add name="Data" type="byte" arr1="Num Data" arr2="Block Size" />
+        <field name="Block Size" type="uint" />
+        <field name="Num Blocks" type="uint" />
+        <field name="Block Offsets" type="uint" arr1="Num Blocks" />
+        <field name="Num Data" type="uint" />
+        <field name="Data Sizes" type="uint" arr1="Num Data" />
+        <field name="Data" type="byte" arr1="Num Data" arr2="Block Size" />
         <!-- NiBSPackedAGDDataBlock -->
-        <add name="Shader Index" type="uint" cond="#ARG# == 1" />
-        <add name="Total Size" type="uint" cond="#ARG# == 1" />
+        <field name="Shader Index" type="uint" cond="#ARG# == 1" />
+        <field name="Total Size" type="uint" cond="#ARG# == 1" />
     </compound>
 
     <compound name="NiAGDDataBlocks">
-        <add name="Has Data" type="bool" />
-        <add name="Data Block" type="NiAGDDataBlock" cond="Has Data" arg="#ARG#" />
+        <field name="Has Data" type="bool" />
+        <field name="Data Block" type="NiAGDDataBlock" cond="Has Data" arg="#ARG#" />
     </compound>
 
     <niobject name="NiAdditionalGeometryData" inherit="AbstractAdditionalGeometryData" module="NiMain">
-        <add name="Num Vertices" type="ushort" />
-        <add name="Num Block Infos" type="uint" />
-        <add name="Block Infos" type="NiAGDDataStream" arr1="Num Block Infos" />
-        <add name="Num Blocks" type="uint" />
-        <add name="Blocks" type="NiAGDDataBlocks" arg="0" arr1="Num Blocks" />
+        <field name="Num Vertices" type="ushort" />
+        <field name="Num Block Infos" type="uint" />
+        <field name="Block Infos" type="NiAGDDataStream" arr1="Num Block Infos" />
+        <field name="Num Blocks" type="uint" />
+        <field name="Blocks" type="NiAGDDataBlocks" arg="0" arr1="Num Blocks" />
     </niobject>
 
     <niobject name="BSPackedAdditionalGeometryData" inherit="AbstractAdditionalGeometryData" module="BSMain" versions="#BETHESDA#">
         No longer appears to occur in any vanilla files. Older versions of FNV had the block in nvdlc01vaultposter01.nif.
-        <add name="Num Vertices" type="ushort" />
-        <add name="Num Block Infos" type="uint" />
-        <add name="Block Infos" type="NiAGDDataStream" arr1="Num Block Infos" />
-        <add name="Num Blocks" type="uint">Usually there is exactly one block.</add>
-        <add name="Blocks" type="NiAGDDataBlocks" arg="1" arr1="Num Blocks" />
+        <field name="Num Vertices" type="ushort" />
+        <field name="Num Block Infos" type="uint" />
+        <field name="Block Infos" type="NiAGDDataStream" arr1="Num Block Infos" />
+        <field name="Num Blocks" type="uint">Usually there is exactly one block.</field>
+        <field name="Blocks" type="NiAGDDataBlocks" arg="1" arr1="Num Blocks" />
     </niobject>
 
     <niobject name="BSWArray" inherit="NiExtraData" module="BSMain" versions="#FO3_AND_LATER#">
         Bethesda-specific extra data.
-        <add name="Num Items" type="uint" />
-        <add name="Items" type="int" arr1="Num Items" />
+        <field name="Num Items" type="uint" />
+        <field name="Items" type="int" arr1="Num Items" />
     </niobject>
 
     <niobject name="BSFrustumFOVController" inherit="NiFloatInterpController" module="BSAnimation" versions="#BETHESDA#">
@@ -6926,53 +6926,53 @@
     <niobject name="bhkBreakableConstraint" inherit="bhkConstraint" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpBreakableConstraintData, a wrapper around hkpConstraintInstance.
         The constraint can "break" i.e. stop applying the forces to each body to keep them constrained.
-        <add name="Constraint Data" type="bhkWrappedConstraintData">The wrapped constraint.</add>
-        <add name="Threshold" type="float">The larger the value, the harder to "break" the constraint.</add>
-        <add name="Remove When Broken" type="bool" default="0">No: Constraint stays active. Yes: Constraint gets removed when breaking threshold is exceeded.</add>
+        <field name="Constraint Data" type="bhkWrappedConstraintData">The wrapped constraint.</field>
+        <field name="Threshold" type="float">The larger the value, the harder to "break" the constraint.</field>
+        <field name="Remove When Broken" type="bool" default="0">No: Constraint stays active. Yes: Constraint gets removed when breaking threshold is exceeded.</field>
     </niobject>
 
     <niobject name="bhkOrientHingedBodyAction" inherit="bhkUnaryAction" module="BSHavok" versions="#BETHESDA#">
         Bethesda extension of hkpReorientAction (or similar). Will try to reorient a body to stay facing a given direction.
-        <add name="Unused 02" type="byte" arr1="8" binary="true" />
-        <add name="Hinge Axis LS" type="Vector4" default="#X_AXIS#" />
-        <add name="Forward LS" type="Vector4" default="#Y_AXIS#" />
-        <add name="Strength" type="float" default="1.0" />
-        <add name="Damping" type="float" default="0.1" />
-        <add name="Unused 03" type="byte" arr1="8" binary="true" />
+        <field name="Unused 02" type="byte" arr1="8" binary="true" />
+        <field name="Hinge Axis LS" type="Vector4" default="#X_AXIS#" />
+        <field name="Forward LS" type="Vector4" default="#Y_AXIS#" />
+        <field name="Strength" type="float" default="1.0" />
+        <field name="Damping" type="float" default="0.1" />
+        <field name="Unused 03" type="byte" arr1="8" binary="true" />
     </niobject>
 
     <niobject name="bhkPoseArray" inherit="NiObject" module="BSHavok" versions="#FO3_AND_LATER#">
         Found in Fallout 3 .psa files, extra ragdoll info for NPCs/creatures. (usually idleanims\deathposes.psa)
         Defines different kill poses. The game selects the pose randomly and applies it to a skeleton immediately upon ragdolling.
         Poses can be previewed in GECK Object Window-Actor Data-Ragdoll and selecting Pose Matching tab.
-        <add name="Num Bones" type="uint" />
-        <add name="Bones" type="NiFixedString" arr1="Num Bones" />
-        <add name="Num Poses" type="uint" />
-        <add name="Poses" type="BonePose" arr1="Num Poses" />
+        <field name="Num Bones" type="uint" />
+        <field name="Bones" type="NiFixedString" arr1="Num Bones" />
+        <field name="Num Poses" type="uint" />
+        <field name="Poses" type="BonePose" arr1="Num Poses" />
     </niobject>
 
     <niobject name="bhkRagdollTemplate" inherit="NiExtraData" module="BSHavok" versions="#FO3_AND_LATER#">
         Found in Fallout 3, more ragdoll info?  (meshes\ragdollconstraint\*.rdt)
-        <add name="Num Bones" type="uint" />
-        <add name="Bones" type="Ref" template="NiObject" arr1="Num Bones" />
+        <field name="Num Bones" type="uint" />
+        <field name="Bones" type="Ref" template="NiObject" arr1="Num Bones" />
     </niobject>
 
     <niobject name="bhkRagdollTemplateData" inherit="NiObject" module="BSHavok" versions="#FO3_AND_LATER#">
         Data for bhkRagdollTemplate
-        <add name="Name" type="NiFixedString" />
-        <add name="Mass" type="float" default="9.0" />
-        <add name="Restitution" type="float" default="0.8" />
-        <add name="Friction" type="float" default="0.3" />
-        <add name="Radius" type="float" default="1.0" />
-        <add name="Material" type="HavokMaterial" />
-        <add name="Num Constraints" type="uint" />
-        <add name="Constraint" type="bhkWrappedConstraintData" arr1="Num Constraints" />
+        <field name="Name" type="NiFixedString" />
+        <field name="Mass" type="float" default="9.0" />
+        <field name="Restitution" type="float" default="0.8" />
+        <field name="Friction" type="float" default="0.3" />
+        <field name="Radius" type="float" default="1.0" />
+        <field name="Material" type="HavokMaterial" />
+        <field name="Num Constraints" type="uint" />
+        <field name="Constraint" type="bhkWrappedConstraintData" arr1="Num Constraints" />
     </niobject>
 
     <compound name="Region" size="8" since="V20_5_0_0">
         A range of indices, which make up a region (such as a submesh).
-        <add name="Start Index" type="uint" />
-        <add name="Num Indices" type="uint" />
+        <field name="Start Index" type="uint" />
+        <field name="Num Indices" type="uint" />
     </compound>
 
     <enum name="CloningBehavior" storage="uint" since="V20_5_0_0">
@@ -7070,43 +7070,43 @@
 
 
     <niobject name="NiDataStream" inherit="NiObject" module="NiMesh" since="V20_5_0_0">
-        <add name="Usage" type="DataStreamUsage" abstract="true"></add>
-        <add name="Access" type="DataStreamAccess" abstract="true"></add>
-        <add name="Num Bytes" type="uint">The size in bytes of this data stream.</add>
-        <add name="Cloning Behavior" type="CloningBehavior" default="CLONING_SHARE" />
-        <add name="Num Regions" type="uint">Number of regions (such as submeshes).</add>
-        <add name="Regions" type="Region" arr1="Num Regions">The regions in the mesh. Regions can be used to mark off submeshes which are independent draw calls.</add>
-        <add name="Num Components" type="uint">Number of components of the data (matches corresponding field in MeshData).</add>
-        <add name="Component Formats" type="ComponentFormat" arr1="Num Components">The format of each component in this data stream.</add>
-        <add name="Data" type="byte" binary="true" arr1="Num Bytes" />
-        <add name="Streamable" type="bool" default="1" />
+        <field name="Usage" type="DataStreamUsage" abstract="true"></field>
+        <field name="Access" type="DataStreamAccess" abstract="true"></field>
+        <field name="Num Bytes" type="uint">The size in bytes of this data stream.</field>
+        <field name="Cloning Behavior" type="CloningBehavior" default="CLONING_SHARE" />
+        <field name="Num Regions" type="uint">Number of regions (such as submeshes).</field>
+        <field name="Regions" type="Region" arr1="Num Regions">The regions in the mesh. Regions can be used to mark off submeshes which are independent draw calls.</field>
+        <field name="Num Components" type="uint">Number of components of the data (matches corresponding field in MeshData).</field>
+        <field name="Component Formats" type="ComponentFormat" arr1="Num Components">The format of each component in this data stream.</field>
+        <field name="Data" type="byte" binary="true" arr1="Num Bytes" />
+        <field name="Streamable" type="bool" default="1" />
     </niobject>
 
     <compound name="SemanticData" size="8" since="V20_5_0_0">
-        <add name="Name" type="NiFixedString">
+        <field name="Name" type="NiFixedString">
             Type of data (POSITION, POSITION_BP, INDEX, NORMAL, NORMAL_BP,
             TEXCOORD, BLENDINDICES, BLENDWEIGHT, BONE_PALETTE, COLOR, DISPLAYLIST,
             MORPH_POSITION, BINORMAL_BP, TANGENT_BP).
-        </add>
-        <add name="Index" type="uint" default="0">
+        </field>
+        <field name="Index" type="uint" default="0">
             An extra index of the data. For example, if there are 3 uv maps,
             then the corresponding TEXCOORD data components would have indices
             0, 1, and 2, respectively.
-        </add>
+        </field>
     </compound>
 
     <compound name="DataStreamRef" since="V20_5_0_0">
-        <add name="Stream" type="Ref" template="NiDataStream">Reference to a data stream object which holds the data used by this reference.</add>
-        <add name="Is Per Instance" type="bool" default="0">Sets whether this stream data is per-instance data for use in hardware instancing.</add>
-        <add name="Num Submeshes" type="ushort" default="1">The number of submesh-to-region mappings that this data stream has.</add>
-        <add name="Submesh To Region Map" type="ushort" arr1="Num Submeshes">A lookup table that maps submeshes to regions.</add>
-        <add name="Num Components" type="uint" default="1" />
-        <add name="Component Semantics" type="SemanticData" arr1="Num Components">Describes the semantic of each component.</add>
+        <field name="Stream" type="Ref" template="NiDataStream">Reference to a data stream object which holds the data used by this reference.</field>
+        <field name="Is Per Instance" type="bool" default="0">Sets whether this stream data is per-instance data for use in hardware instancing.</field>
+        <field name="Num Submeshes" type="ushort" default="1">The number of submesh-to-region mappings that this data stream has.</field>
+        <field name="Submesh To Region Map" type="ushort" arr1="Num Submeshes">A lookup table that maps submeshes to regions.</field>
+        <field name="Num Components" type="uint" default="1" />
+        <field name="Component Semantics" type="SemanticData" arr1="Num Components">Describes the semantic of each component.</field>
     </compound>
 
     <niobject name="NiRenderObject" abstract="true" inherit="NiAVObject" module="NiMain" since="V20_5_0_0">
         An object that can be rendered.
-        <add name="Material Data" type="MaterialData">Per-material data.</add>
+        <field name="Material Data" type="MaterialData">Per-material data.</field>
     </niobject>
 
     <enum name="MeshPrimitiveType" storage="uint" since="V20_5_0_0">
@@ -7133,83 +7133,83 @@
 
     <niobject name="NiMeshModifier" abstract="true" inherit="NiObject" module="NiMesh">
         Base class for mesh modifiers.
-        <add name="Num Submit Points" type="uint" />
-        <add name="Submit Points" type="SyncPoint" arr1="Num Submit Points">The sync points supported by this mesh modifier for SubmitTasks.</add>
-        <add name="Num Complete Points" type="uint" />
-        <add name="Complete Points" type="SyncPoint" arr1="Num Complete Points">The sync points supported by this mesh modifier for CompleteTasks.</add>
+        <field name="Num Submit Points" type="uint" />
+        <field name="Submit Points" type="SyncPoint" arr1="Num Submit Points">The sync points supported by this mesh modifier for SubmitTasks.</field>
+        <field name="Num Complete Points" type="uint" />
+        <field name="Complete Points" type="SyncPoint" arr1="Num Complete Points">The sync points supported by this mesh modifier for CompleteTasks.</field>
     </niobject>
 
     <compound name="MeshDataEpicMickey" versions="V20_6_5_0_DEM">
-        <add name="Unknown 1" type="int" />
-        <add name="Unknown 2" type="int" />
-        <add name="Unknown 3" type="int" vercond="#USER# #GT# 14" />
-        <add name="Unknown 4" type="int" />
-        <add name="Unknown 5" type="float" />
-        <add name="Unknown 6" type="int" />
+        <field name="Unknown 1" type="int" />
+        <field name="Unknown 2" type="int" />
+        <field name="Unknown 3" type="int" vercond="#USER# #GT# 14" />
+        <field name="Unknown 4" type="int" />
+        <field name="Unknown 5" type="float" />
+        <field name="Unknown 6" type="int" />
     </compound>
 
     <compound name="WeightDataEpicMickey" size="24" versions="V20_6_5_0_DEM">
-        <add name="Bone Indices" type="int" arr1="3" />
-        <add name="Weights" type="float" arr1="3" />
+        <field name="Bone Indices" type="int" arr1="3" />
+        <field name="Weights" type="float" arr1="3" />
     </compound>
 
     <compound name="PartitionDataEpicMickey" size="28" versions="V20_6_5_0_DEM">
-        <add name="Start" type="int" />
-        <add name="End" type="int" />
-        <add name="Weight Indices" type="ushort" arr1="10" />
+        <field name="Start" type="int" />
+        <field name="End" type="int" />
+        <field name="Weight Indices" type="ushort" arr1="10" />
     </compound>
 
     <compound name="ExtraMeshDataEpicMickey" versions="V20_6_5_0_DEM">
-        <add name="Unknown 1" type="uint" />
-        <add name="Num Unknown Floats" type="uint" />
-        <add name="Unknown Floats 1" type="float" arr1="Num Unknown Floats" />
-        <add name="Num Weights" type="uint" />
-        <add name="Weights" type="WeightDataEpicMickey" arr1="Num Weights" />
-        <add name="Vertex to Weight Map Size" type="uint" />
-        <add name="Vertex to Weight Map" type="uint" arr1="Vertex to Weight Map Size" />
-        <add name="Unknown Data Size" type="uint" />
-        <add name="Unknown Data Width" type="uint" />
-        <add name="Unknown Data" type="Vector3" arr1="Unknown Data Size" arr2="Unknown Data Width" />
-        <add name="Unknown Indices" type="ushort" arr1="Unknown Data Size" />
-        <add name="Num Mapped Primitives" type="ushort" vercond="#USER# #LT# 17">When non-zero, equal to the number of primitives.</add>
-        <add name="Num Mapped Primitives" type="uint" vercond="#USER# == 17">When non-zero, equal to the number of primitives.</add>
-        <add name="Mapped Primitives" type="byte" arr1="Num Mapped Primitives">Some integer associated with each primitive.</add>
-        <add name="Partition Size" type="uint" />
-        <add name="Partitions" type="PartitionDataEpicMickey" arr1="Partition Size" />
-        <add name="Max Primitive Map Index" type="uint">The max value to appear in the Mapped Primitives array.</add>
+        <field name="Unknown 1" type="uint" />
+        <field name="Num Unknown Floats" type="uint" />
+        <field name="Unknown Floats 1" type="float" arr1="Num Unknown Floats" />
+        <field name="Num Weights" type="uint" />
+        <field name="Weights" type="WeightDataEpicMickey" arr1="Num Weights" />
+        <field name="Vertex to Weight Map Size" type="uint" />
+        <field name="Vertex to Weight Map" type="uint" arr1="Vertex to Weight Map Size" />
+        <field name="Unknown Data Size" type="uint" />
+        <field name="Unknown Data Width" type="uint" />
+        <field name="Unknown Data" type="Vector3" arr1="Unknown Data Size" arr2="Unknown Data Width" />
+        <field name="Unknown Indices" type="ushort" arr1="Unknown Data Size" />
+        <field name="Num Mapped Primitives" type="ushort" vercond="#USER# #LT# 17">When non-zero, equal to the number of primitives.</field>
+        <field name="Num Mapped Primitives" type="uint" vercond="#USER# == 17">When non-zero, equal to the number of primitives.</field>
+        <field name="Mapped Primitives" type="byte" arr1="Num Mapped Primitives">Some integer associated with each primitive.</field>
+        <field name="Partition Size" type="uint" />
+        <field name="Partitions" type="PartitionDataEpicMickey" arr1="Partition Size" />
+        <field name="Max Primitive Map Index" type="uint">The max value to appear in the Mapped Primitives array.</field>
     </compound>
 
     <niobject name="NiMesh" inherit="NiRenderObject" module="NiMesh" since="V20_5_0_0">
-        <add name="Primitive Type" type="MeshPrimitiveType">The primitive type of the mesh, such as triangles or lines.</add>
-        <add name="EM Data" type="MeshDataEpicMickey" ver1="20.6.5.0" ver2="20.6.5.0" />
-        <add name="Num Submeshes" type="ushort">The number of submeshes contained in this mesh.</add>
-        <add name="Instancing Enabled" type="bool">Sets whether hardware instancing is being used.</add>
-        <add name="Bounding Sphere" type="NiBound">The combined bounding volume of all submeshes.</add>
-        <add name="Num Datastreams" type="uint" />
-        <add name="Datastreams" type="DataStreamRef" arr1="Num Datastreams" />
-        <add name="Num Modifiers" type="uint" />
-        <add name="Modifiers" type="Ref" template="NiMeshModifier" arr1="Num Modifiers" />
-        <add name="Has Extra EM Data" type="bool" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 9" />
-        <add name="Extra EM Data" type="ExtraMeshDataEpicMickey" cond="Has Extra EM Data" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 9" />
+        <field name="Primitive Type" type="MeshPrimitiveType">The primitive type of the mesh, such as triangles or lines.</field>
+        <field name="EM Data" type="MeshDataEpicMickey" ver1="20.6.5.0" ver2="20.6.5.0" />
+        <field name="Num Submeshes" type="ushort">The number of submeshes contained in this mesh.</field>
+        <field name="Instancing Enabled" type="bool">Sets whether hardware instancing is being used.</field>
+        <field name="Bounding Sphere" type="NiBound">The combined bounding volume of all submeshes.</field>
+        <field name="Num Datastreams" type="uint" />
+        <field name="Datastreams" type="DataStreamRef" arr1="Num Datastreams" />
+        <field name="Num Modifiers" type="uint" />
+        <field name="Modifiers" type="Ref" template="NiMeshModifier" arr1="Num Modifiers" />
+        <field name="Has Extra EM Data" type="bool" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 9" />
+        <field name="Extra EM Data" type="ExtraMeshDataEpicMickey" cond="Has Extra EM Data" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 9" />
     </niobject>
 
     <niobject name="NiMorphWeightsController" inherit="NiInterpController" module="NiAnimation" since="V20_5_0_0">
         Manipulates a mesh with the semantic MORPHWEIGHTS using an NiMorphMeshModifier.
-        <add name="Count" type="uint" />
-        <add name="Num Interpolators" type="uint" />
-        <add name="Interpolators" type="Ref" template="NiInterpolator" arr1="Num Interpolators" />
-        <add name="Num Targets" type="uint" />
-        <add name="Target Names" type="NiFixedString" arr1="Num Targets" />
+        <field name="Count" type="uint" />
+        <field name="Num Interpolators" type="uint" />
+        <field name="Interpolators" type="Ref" template="NiInterpolator" arr1="Num Interpolators" />
+        <field name="Num Targets" type="uint" />
+        <field name="Target Names" type="NiFixedString" arr1="Num Targets" />
     </niobject>
 
     <compound name="ElementReference" size="12" since="V20_5_0_0">
-        <add name="Semantic" type="SemanticData">The element semantic.</add>
-        <add name="Normalize Flag" type="uint">Whether or not to normalize the data.</add>
+        <field name="Semantic" type="SemanticData">The element semantic.</field>
+        <field name="Normalize Flag" type="uint">Whether or not to normalize the data.</field>
     </compound>
 
     <niobject name="NiMorphMeshModifier" inherit="NiMeshModifier" module="NiMesh" since="V20_5_0_0">
         Performs linear-weighted blending between a set of target data streams.
-        <add name="Flags" type="byte">
+        <field name="Flags" type="byte">
             FLAG_RELATIVETARGETS = 0x01
             FLAG_UPDATENORMALS   = 0x02
             FLAG_NEEDSUPDATE     = 0x04
@@ -7217,65 +7217,65 @@
             FLAG_NEEDSCOMPLETION = 0x10
             FLAG_SKINNED         = 0x20
             FLAG_SWSKINNED       = 0x40
-        </add>
-        <add name="Num Targets" type="ushort">The number of morph targets.</add>
-        <add name="Num Elements" type="uint">The number of morphing data stream elements.</add>
-        <add name="Elements" type="ElementReference" arr1="Num Elements">Semantics and normalization of the morphing data stream elements.</add>
+        </field>
+        <field name="Num Targets" type="ushort">The number of morph targets.</field>
+        <field name="Num Elements" type="uint">The number of morphing data stream elements.</field>
+        <field name="Elements" type="ElementReference" arr1="Num Elements">Semantics and normalization of the morphing data stream elements.</field>
     </niobject>
 
     <niobject name="NiSkinningMeshModifier" inherit="NiMeshModifier" module="NiMesh" since="V20_5_0_0">
-        <add name="Flags" type="ushort">
+        <field name="Flags" type="ushort">
             USE_SOFTWARE_SKINNING = 0x0001
             RECOMPUTE_BOUNDS = 0x0002
-        </add>
-        <add name="Skeleton Root" type="Ptr" template="NiAVObject">The root bone of the skeleton.</add>
-        <add name="Skeleton Transform" type="NiTransform">The transform that takes the root bone parent coordinate system into the skin coordinate system.</add>
-        <add name="Num Bones" type="uint">The number of bones referenced by this mesh modifier.</add>
-        <add name="Bones" type="Ptr" template="NiAVObject" arr1="Num Bones">Pointers to the bone nodes that affect this skin.</add>
-        <add name="Bone Transforms" type="NiTransform" arr1="Num Bones">The transforms that go from bind-pose space to bone space.</add>
-        <add name="Bone Bounds" type="NiBound" cond="Flags #BITAND# 2" arr1="Num Bones">The bounds of the bones.  Only stored if the RECOMPUTE_BOUNDS bit is set.</add>
+        </field>
+        <field name="Skeleton Root" type="Ptr" template="NiAVObject">The root bone of the skeleton.</field>
+        <field name="Skeleton Transform" type="NiTransform">The transform that takes the root bone parent coordinate system into the skin coordinate system.</field>
+        <field name="Num Bones" type="uint">The number of bones referenced by this mesh modifier.</field>
+        <field name="Bones" type="Ptr" template="NiAVObject" arr1="Num Bones">Pointers to the bone nodes that affect this skin.</field>
+        <field name="Bone Transforms" type="NiTransform" arr1="Num Bones">The transforms that go from bind-pose space to bone space.</field>
+        <field name="Bone Bounds" type="NiBound" cond="Flags #BITAND# 2" arr1="Num Bones">The bounds of the bones.  Only stored if the RECOMPUTE_BOUNDS bit is set.</field>
     </niobject>
 
     <niobject name="NiMeshHWInstance" inherit="NiAVObject" module="NiMesh" since="V20_5_0_0">
         An instance of a hardware-instanced mesh in a scene graph.
-        <add name="Master Mesh" type="Ref" template="NiMesh">The instanced mesh this object represents.</add>
-        <add name="Mesh Modifier" type="Ref" template="NiInstancingMeshModifier" />
+        <field name="Master Mesh" type="Ref" template="NiMesh">The instanced mesh this object represents.</field>
+        <field name="Mesh Modifier" type="Ref" template="NiInstancingMeshModifier" />
     </niobject>
 
     <niobject name="NiInstancingMeshModifier" inherit="NiMeshModifier" module="NiMesh" since="V20_5_0_0">
         Mesh modifier that provides per-frame instancing capabilities in Gamebryo.
-        <add name="Has Instance Nodes" type="bool" />
-        <add name="Per Instance Culling" type="bool" />
-        <add name="Has Static Bounds" type="bool" />
-        <add name="Affected Mesh" type="Ref" template="NiMesh" />
-        <add name="Bounding Sphere" type="NiBound" cond="Has Static Bounds" />
-        <add name="Num Instance Nodes" type="uint" cond="Has Instance Nodes" />
-        <add name="Instance Nodes" type="Ref" template="NiMeshHWInstance" arr1="Num Instance Nodes" cond="Has Instance Nodes" />
+        <field name="Has Instance Nodes" type="bool" />
+        <field name="Per Instance Culling" type="bool" />
+        <field name="Has Static Bounds" type="bool" />
+        <field name="Affected Mesh" type="Ref" template="NiMesh" />
+        <field name="Bounding Sphere" type="NiBound" cond="Has Static Bounds" />
+        <field name="Num Instance Nodes" type="uint" cond="Has Instance Nodes" />
+        <field name="Instance Nodes" type="Ref" template="NiMeshHWInstance" arr1="Num Instance Nodes" cond="Has Instance Nodes" />
     </niobject>
 
     <compound name="LODInfo">
-        <add name="Num Bones" type="uint" />
-        <add name="Num Active Skins" type="uint" />
-        <add name="Skin Indices" type="uint" arr1="Num Active Skins" />
+        <field name="Num Bones" type="uint" />
+        <field name="Num Active Skins" type="uint" />
+        <field name="Skin Indices" type="uint" arr1="Num Active Skins" />
     </compound>
 
     <niobject name="NiSkinningLODController" inherit="NiTimeController" module="NiAnimation" since="V20_5_0_0">
         Defines the levels of detail for a given character and dictates the character's current LOD.
-        <add name="Current LOD" type="uint" />
-        <add name="Num Bones" type="uint" />
-        <add name="Bones" type="Ref" template="NiNode" arr1="Num Bones" />
-        <add name="Num Skins" type="uint" />
-        <add name="Skins" type="Ref" template="NiMesh" arr1="Num Skins" />
-        <add name="Num LOD Levels" type="uint" />
-        <add name="LODs" type="LODInfo" arr1="Num LOD Levels" />
+        <field name="Current LOD" type="uint" />
+        <field name="Num Bones" type="uint" />
+        <field name="Bones" type="Ref" template="NiNode" arr1="Num Bones" />
+        <field name="Num Skins" type="uint" />
+        <field name="Skins" type="Ref" template="NiMesh" arr1="Num Skins" />
+        <field name="Num LOD Levels" type="uint" />
+        <field name="LODs" type="LODInfo" arr1="Num LOD Levels" />
     </niobject>
 
 
     <!-- NiPS Particle System -->
 
     <compound name="PSSpawnRateKey" size="8" since="V20_5_0_0">
-        <add name="Value" type="float" />
-        <add name="Time" type="float" />
+        <field name="Value" type="float" />
+        <field name="Time" type="float" />
     </compound>
 
     <enum name="AlignMethod" storage="uint" since="V20_5_0_0">
@@ -7290,37 +7290,37 @@
 
     <niobject name="NiPSParticleSystem" inherit="NiMesh" module="NiPSParticle" since="V20_5_0_0">
         Represents a particle system.
-        <add name="Simulator" type="Ref" template="NiPSSimulator" />
-        <add name="Generator" type="Ref" template="NiPSBoundUpdater" />
-        <add name="Num Emitters" type="uint" />
-        <add name="Emitters" type="Ref" template="NiPSEmitter" arr1="Num Emitters" />
-        <add name="Num Spawners" type="uint" />
-        <add name="Spawners" type="Ref" template="NiPSSpawner" arr1="Num Spawners" />
-        <add name="Death Spawner" type="Ref" template="NiPSSpawner" />
-        <add name="Max Num Particles" type="uint" />
-        <add name="Has Colors" type="bool" />
-        <add name="Has Rotations" type="bool" />
-        <add name="Has Rotation Axes" type="bool" />
-        <add name="Has Animated Textures" type="bool" ver1="20.6.1.0" />
-        <add name="World Space" type="bool" default="1" />
-        <add name="Normal Method" type="AlignMethod" default="ALIGN_CAMERA" ver1="20.6.1.0" />
-        <add name="Normal Direction" type="Vector3" ver1="20.6.1.0" />
-        <add name="Up Method" type="AlignMethod" default="ALIGN_CAMERA" ver1="20.6.1.0" />
-        <add name="Up Direction" type="Vector3" ver1="20.6.1.0" />
-        <add name="Living Spawner" type="Ref" template="NiPSSpawner" ver1="20.6.1.0" />
-        <add name="Num Spawn Rate Keys" type="byte" ver1="20.6.1.0" />
-        <add name="Spawn Rate Keys" type="PSSpawnRateKey" arr1="Num Spawn Rate Keys" ver1="20.6.1.0" />
-        <add name="Pre RPI" type="bool" ver1="20.6.1.0" />
-        <add name="DEM Unknown Int" type="uint" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
-        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
+        <field name="Simulator" type="Ref" template="NiPSSimulator" />
+        <field name="Generator" type="Ref" template="NiPSBoundUpdater" />
+        <field name="Num Emitters" type="uint" />
+        <field name="Emitters" type="Ref" template="NiPSEmitter" arr1="Num Emitters" />
+        <field name="Num Spawners" type="uint" />
+        <field name="Spawners" type="Ref" template="NiPSSpawner" arr1="Num Spawners" />
+        <field name="Death Spawner" type="Ref" template="NiPSSpawner" />
+        <field name="Max Num Particles" type="uint" />
+        <field name="Has Colors" type="bool" />
+        <field name="Has Rotations" type="bool" />
+        <field name="Has Rotation Axes" type="bool" />
+        <field name="Has Animated Textures" type="bool" ver1="20.6.1.0" />
+        <field name="World Space" type="bool" default="1" />
+        <field name="Normal Method" type="AlignMethod" default="ALIGN_CAMERA" ver1="20.6.1.0" />
+        <field name="Normal Direction" type="Vector3" ver1="20.6.1.0" />
+        <field name="Up Method" type="AlignMethod" default="ALIGN_CAMERA" ver1="20.6.1.0" />
+        <field name="Up Direction" type="Vector3" ver1="20.6.1.0" />
+        <field name="Living Spawner" type="Ref" template="NiPSSpawner" ver1="20.6.1.0" />
+        <field name="Num Spawn Rate Keys" type="byte" ver1="20.6.1.0" />
+        <field name="Spawn Rate Keys" type="PSSpawnRateKey" arr1="Num Spawn Rate Keys" ver1="20.6.1.0" />
+        <field name="Pre RPI" type="bool" ver1="20.6.1.0" />
+        <field name="DEM Unknown Int" type="uint" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
+        <field name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
     <niobject name="NiPSMeshParticleSystem" inherit="NiPSParticleSystem" module="NiPSParticle" since="V20_5_0_0">
         Represents a particle system that uses mesh particles instead of sprite-based particles.
-        <add name="Num Generations" type="uint" />
-        <add name="Master Particles" type="Ref" template="NiAVObject" arr1="Num Generations" />
-        <add name="Pool Size" type="uint" />
-        <add name="Auto Fill Pools" type="bool" />
+        <field name="Num Generations" type="uint" />
+        <field name="Master Particles" type="Ref" template="NiAVObject" arr1="Num Generations" />
+        <field name="Pool Size" type="uint" />
+        <field name="Auto Fill Pools" type="bool" />
     </niobject>
 
     <!-- NiPS Generators -->
@@ -7331,32 +7331,32 @@
 
     <niobject name="NiPSAlignedQuadGenerator" inherit="NiMeshModifier" module="NiPSParticle" since="V20_5_0_0">
         A mesh modifier that uses particle system data to generate aligned quads for each particle.
-        <add name="Scale Amount U" type="float" />
-        <add name="Scale Limit U" type="float" default="10000.0" />
-        <add name="Scale Rest U" type="float" default="1.0" />
-        <add name="Scale Amount V" type="float" />
-        <add name="Scale Limit V" type="float" default="10000.0" />
-        <add name="Scale Rest V" type="float" default="1.0" />
-        <add name="Center U" type="float" />
-        <add name="Center V" type="float" />
-        <add name="UV Scrolling" type="bool" />
-        <add name="Num Frames Across" type="ushort" default="1" />
-        <add name="Num Frames Down" type="ushort" default="1" />
-        <add name="Ping Pong" type="bool" />
-        <add name="Initial Frame" type="ushort" />
-        <add name="Initial Frame Variation" type="float" />
-        <add name="Num Frames" type="ushort" />
-        <add name="Num Frames Variation" type="float" />
-        <add name="Initial Time" type="float" />
-        <add name="Final Time" type="float" default="1.0" />
+        <field name="Scale Amount U" type="float" />
+        <field name="Scale Limit U" type="float" default="10000.0" />
+        <field name="Scale Rest U" type="float" default="1.0" />
+        <field name="Scale Amount V" type="float" />
+        <field name="Scale Limit V" type="float" default="10000.0" />
+        <field name="Scale Rest V" type="float" default="1.0" />
+        <field name="Center U" type="float" />
+        <field name="Center V" type="float" />
+        <field name="UV Scrolling" type="bool" />
+        <field name="Num Frames Across" type="ushort" default="1" />
+        <field name="Num Frames Down" type="ushort" default="1" />
+        <field name="Ping Pong" type="bool" />
+        <field name="Initial Frame" type="ushort" />
+        <field name="Initial Frame Variation" type="float" />
+        <field name="Num Frames" type="ushort" />
+        <field name="Num Frames Variation" type="float" />
+        <field name="Initial Time" type="float" />
+        <field name="Final Time" type="float" default="1.0" />
     </niobject>
 
     <!-- NiPS Simulators -->
 
     <niobject name="NiPSSimulator" inherit="NiMeshModifier" module="NiPSParticle" since="V20_5_0_0">
         The mesh modifier that performs all particle system simulation.
-        <add name="Num Simulation Steps" type="uint" />
-        <add name="Simulation Steps" type="Ref" template="NiPSSimulatorStep" arr1="Num Simulation Steps" />
+        <field name="Num Simulation Steps" type="uint" />
+        <field name="Simulation Steps" type="Ref" template="NiPSSimulatorStep" arr1="Num Simulation Steps" />
     </niobject>
 
     <niobject name="NiPSSimulatorStep" abstract="true" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
@@ -7373,39 +7373,39 @@
 
     <niobject name="NiPSSimulatorGeneralStep" inherit="NiPSSimulatorStep" module="NiPSParticle" since="V20_5_0_0">
         Encapsulates a floodgate kernel that updates particle size, colors, and rotations.
-        <add name="Num Size Keys" type="byte" ver1="20.6.1.0" />
-        <add name="Size Keys" type="Key" template="float" arg="1" arr1="Num Size Keys" ver1="20.6.1.0">The particle size keys.</add>
-        <add name="Size Loop Behavior" type="PSLoopBehavior" default="PS_LOOP_AGESCALE" ver1="20.6.1.0">The loop behavior for the size keys.</add>
-        <add name="Num Color Keys" type="byte" />
-        <add name="Color Keys" type="Key" template="ByteColor4" arg="1" arr1="Num Color Keys">The particle color keys.</add>
-        <add name="Color Loop Behavior" type="PSLoopBehavior" default="PS_LOOP_AGESCALE" ver1="20.6.1.0">The loop behavior for the color keys.</add>
-        <add name="Num Rotation Keys" type="byte" ver1="20.6.1.0" />
-        <add name="Rotation Keys" type="QuatKey" template="Quaternion" arg="1" arr1="Num Rotation Keys" ver1="20.6.1.0">The particle rotation keys.</add>
-        <add name="Rotation Loop Behavior" type="PSLoopBehavior" default="PS_LOOP_AGESCALE" ver1="20.6.1.0">The loop behavior for the rotation keys.</add>
-        <add name="Grow Time" type="float"> The the amount of time over which a particle's size is ramped from 0.0 to 1.0 in seconds</add>
-        <add name="Shrink Time" type="float">The the amount of time over which a particle's size is ramped from 1.0 to 0.0 in seconds</add>
-        <add name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</add>
-        <add name="Shrink Generation" type="ushort">Specifies the particle generation to which the shrink effect should be applied. This is usually the highest supported generation for the particle system, so that particles will shrink immediately before getting killed.</add>
-        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
+        <field name="Num Size Keys" type="byte" ver1="20.6.1.0" />
+        <field name="Size Keys" type="Key" template="float" arg="1" arr1="Num Size Keys" ver1="20.6.1.0">The particle size keys.</field>
+        <field name="Size Loop Behavior" type="PSLoopBehavior" default="PS_LOOP_AGESCALE" ver1="20.6.1.0">The loop behavior for the size keys.</field>
+        <field name="Num Color Keys" type="byte" />
+        <field name="Color Keys" type="Key" template="ByteColor4" arg="1" arr1="Num Color Keys">The particle color keys.</field>
+        <field name="Color Loop Behavior" type="PSLoopBehavior" default="PS_LOOP_AGESCALE" ver1="20.6.1.0">The loop behavior for the color keys.</field>
+        <field name="Num Rotation Keys" type="byte" ver1="20.6.1.0" />
+        <field name="Rotation Keys" type="QuatKey" template="Quaternion" arg="1" arr1="Num Rotation Keys" ver1="20.6.1.0">The particle rotation keys.</field>
+        <field name="Rotation Loop Behavior" type="PSLoopBehavior" default="PS_LOOP_AGESCALE" ver1="20.6.1.0">The loop behavior for the rotation keys.</field>
+        <field name="Grow Time" type="float"> The the amount of time over which a particle's size is ramped from 0.0 to 1.0 in seconds</field>
+        <field name="Shrink Time" type="float">The the amount of time over which a particle's size is ramped from 1.0 to 0.0 in seconds</field>
+        <field name="Grow Generation" type="ushort">Specifies the particle generation to which the grow effect should be applied. This is usually generation 0, so that newly created particles will grow.</field>
+        <field name="Shrink Generation" type="ushort">Specifies the particle generation to which the shrink effect should be applied. This is usually the highest supported generation for the particle system, so that particles will shrink immediately before getting killed.</field>
+        <field name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
     <niobject name="NiPSSimulatorForcesStep" inherit="NiPSSimulatorStep" module="NiPSParticle" since="V20_5_0_0">
         Encapsulates a floodgate kernel that simulates particle forces.
-        <add name="Num Forces" type="uint" />
-        <add name="Forces" type="Ref" template="NiPSForce" arr1="Num Forces">The forces affecting the particle system.</add>
+        <field name="Num Forces" type="uint" />
+        <field name="Forces" type="Ref" template="NiPSForce" arr1="Num Forces">The forces affecting the particle system.</field>
     </niobject>
 
     <niobject name="NiPSSimulatorCollidersStep" inherit="NiPSSimulatorStep" module="NiPSParticle" since="V20_5_0_0">
         Encapsulates a floodgate kernel that simulates particle colliders.
-        <add name="Num Colliders" type="uint" />
-        <add name="Colliders" type="Ref" template="NiPSCollider" arr1="Num Colliders">The colliders affecting the particle system.</add>
+        <field name="Num Colliders" type="uint" />
+        <field name="Colliders" type="Ref" template="NiPSCollider" arr1="Num Colliders">The colliders affecting the particle system.</field>
     </niobject>
 
     <niobject name="NiPSSimulatorMeshAlignStep" inherit="NiPSSimulatorStep" module="NiPSParticle" since="V20_5_0_0">
         Encapsulates a floodgate kernel that updates mesh particle alignment and transforms.
-        <add name="Num Rotation Keys" type="byte" />
-        <add name="Rotation Keys" type="QuatKey" template="Quaternion" arg="1" arr1="Num Rotation Keys">The particle rotation keys.</add>
-        <add name="Rotation Loop Behavior" type="PSLoopBehavior">The loop behavior for the rotation keys.</add>
+        <field name="Num Rotation Keys" type="byte" />
+        <field name="Rotation Keys" type="QuatKey" template="Quaternion" arg="1" arr1="Num Rotation Keys">The particle rotation keys.</field>
+        <field name="Rotation Loop Behavior" type="PSLoopBehavior">The loop behavior for the rotation keys.</field>
     </niobject>
 
     <niobject name="NiPSSimulatorFinalStep" inherit="NiPSSimulatorStep" module="NiPSParticle" since="V20_5_0_0">
@@ -7414,7 +7414,7 @@
 
     <niobject name="NiPSBoundUpdater" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Updates the bounding volume for an NiPSParticleSystem object.
-        <add name="Update Skip" type="ushort">Number of particle bounds to skip updating every frame. Higher = more updates each frame.</add>
+        <field name="Update Skip" type="ushort">Number of particle bounds to skip updating every frame. Higher = more updates each frame.</field>
     </niobject>
 
     <!-- NiPS Forces -->
@@ -7434,8 +7434,8 @@
 
     <niobject name="NiPSForce" abstract="true" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle forces.
-        <add name="Name" type="NiFixedString" />
-        <add name="Type" type="PSForceType">
+        <field name="Name" type="NiFixedString" />
+        <field name="Type" type="PSForceType">
             The force type is set by each derived class and cannot be changed.
             <default type="NiPSBombForce" value="FORCE_BOMB" />
             <default type="NiPSDragForce" value="FORCE_DRAG" />
@@ -7446,167 +7446,167 @@
             <default type="NiPSTurbulenceFieldForce" value="FORCE_TURBULENCE_FIELD" />
             <default type="NiPSVortexFieldForce" value="FORCE_VORTEX_FIELD" />
             <default type="NiPSGravityForce" value="FORCE_GRAVITY" />
-        </add>
-        <add name="Active" type="bool" />
+        </field>
+        <field name="Active" type="bool" />
     </niobject>
 
     <niobject name="NiPSFieldForce" abstract="true" inherit="NiPSForce" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle field forces.
-        <add name="Field Object" type="Ref" template="NiAVObject" />
-        <add name="Magnitude" type="float" />
-        <add name="Attenuation" type="float" />
-        <add name="Use Max Distance" type="bool" />
-        <add name="Max Distance" type="float" />
+        <field name="Field Object" type="Ref" template="NiAVObject" />
+        <field name="Magnitude" type="float" />
+        <field name="Attenuation" type="float" />
+        <field name="Use Max Distance" type="bool" />
+        <field name="Max Distance" type="float" />
     </niobject>
 
     <niobject name="NiPSDragForce" inherit="NiPSForce" module="NiPSParticle" since="V20_5_0_0">
         Applies a linear drag force to particles.
-        <add name="Drag Axis" type="Vector3" default="#X_AXIS#" />
-        <add name="Percentage" type="float" default="0.05" />
-        <add name="Range" type="float" default="#FLT_MAX#" />
-        <add name="Range Falloff" type="float" default="#FLT_MAX#" />
-        <add name="Drag Object" type="Ptr" template="NiAVObject" />
+        <field name="Drag Axis" type="Vector3" default="#X_AXIS#" />
+        <field name="Percentage" type="float" default="0.05" />
+        <field name="Range" type="float" default="#FLT_MAX#" />
+        <field name="Range Falloff" type="float" default="#FLT_MAX#" />
+        <field name="Drag Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPSGravityForce" inherit="NiPSForce" module="NiPSParticle" since="V20_5_0_0">
         Applies a gravitational force to particles.
-        <add name="Gravity Axis" type="Vector3" default="#X_AXIS#" />
-        <add name="Decay" type="float" />
-        <add name="Strength" type="float" />
-        <add name="Force Type" type="ForceType" />
-        <add name="Turbulence" type="float" />
-        <add name="Turbulence Scale" type="float" default="1.0" />
-        <add name="Gravity Object" type="Ptr" template="NiAVObject" />
+        <field name="Gravity Axis" type="Vector3" default="#X_AXIS#" />
+        <field name="Decay" type="float" />
+        <field name="Strength" type="float" />
+        <field name="Force Type" type="ForceType" />
+        <field name="Turbulence" type="float" />
+        <field name="Turbulence Scale" type="float" default="1.0" />
+        <field name="Gravity Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPSBombForce" inherit="NiPSForce" module="NiPSParticle" since="V20_5_0_0">
         Applies an explosive force to particles.
-        <add name="Bomb Axis" type="Vector3" default="#X_AXIS#" />
-        <add name="Decay" type="float" />
-        <add name="Delta V" type="float" />
-        <add name="Decay Type" type="DecayType" />
-        <add name="Symmetry Type" type="SymmetryType" />
-        <add name="Bomb Object" type="Ptr" template="NiAVObject" />
+        <field name="Bomb Axis" type="Vector3" default="#X_AXIS#" />
+        <field name="Decay" type="float" />
+        <field name="Delta V" type="float" />
+        <field name="Decay Type" type="DecayType" />
+        <field name="Symmetry Type" type="SymmetryType" />
+        <field name="Bomb Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPSAirFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of air movements.
-        <add name="Direction" type="Vector3" />
-        <add name="Air Friction" type="float" />
-        <add name="Inherited Velocity" type="float" />
-        <add name="Inherit Rotation" type="bool" />
-        <add name="Enable Spread" type="bool" />
-        <add name="Spread" type="float" />
+        <field name="Direction" type="Vector3" />
+        <field name="Air Friction" type="float" />
+        <field name="Inherited Velocity" type="float" />
+        <field name="Inherit Rotation" type="bool" />
+        <field name="Enable Spread" type="bool" />
+        <field name="Spread" type="float" />
     </niobject>
 
     <niobject name="NiPSGravityFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of directional gravity.
-        <add name="DEM Unknown Short" type="ushort" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
-        <add name="Direction" type="Vector3" default="#X_AXIS#" />
-        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
+        <field name="DEM Unknown Short" type="ushort" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
+        <field name="Direction" type="Vector3" default="#X_AXIS#" />
+        <field name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
     </niobject>
 
     <niobject name="NiPSDragFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of drag.
-        <add name="Use Direction" type="bool" />
-        <add name="Direction" type="Vector3" default="#X_AXIS#" />
+        <field name="Use Direction" type="bool" />
+        <field name="Direction" type="Vector3" default="#X_AXIS#" />
     </niobject>
 
     <niobject name="NiPSRadialFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of point gravity.
-        <add name="Radial Factor" type="float" />
+        <field name="Radial Factor" type="float" />
     </niobject>
 
     <niobject name="NiPSTurbulenceFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of turbulence.
-        <add name="Frequency" type="float" />
+        <field name="Frequency" type="float" />
     </niobject>
 
     <niobject name="NiPSVortexFieldForce" inherit="NiPSFieldForce" module="NiPSParticle" since="V20_5_0_0">
         Inside a field, updates particle velocity to simulate the effects of a vortex.
-        <add name="Direction" type="Vector3" default="#X_AXIS#" />
+        <field name="Direction" type="Vector3" default="#X_AXIS#" />
     </niobject>
 
     <!-- NiPS Emitters -->
 
     <niobject name="NiPSEmitter" abstract="true" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle emitters.
-        <add name="Name" type="NiFixedString" />
-        <add name="Speed" type="float" />
-        <add name="Speed Var" type="float" />
-        <add name="Speed Flip Ratio" type="float" ver1="20.6.1.0" />
-        <add name="Declination" type="float" />
-        <add name="Declination Var" type="float" />
-        <add name="Planar Angle" type="float" />
-        <add name="Planar Angle Var" type="float" />
-        <add name="Color" type="ByteColor4" ver2="20.6.0.0" />
-        <add name="Size" type="float" />
-        <add name="Size Var" type="float" />
-        <add name="Lifespan" type="float" />
-        <add name="Lifespan Var" type="float" />
-        <add name="Rotation Angle" type="float" />
-        <add name="Rotation Angle Var" type="float" />
-        <add name="Rotation Speed" type="float" />
-        <add name="Rotation Speed Var" type="float" />
-        <add name="Rotation Axis" type="Vector3" />
-        <add name="Random Rot Speed Sign" type="bool" />
-        <add name="Random Rot Axis" type="bool" />
-        <add name="Unknown" type="bool" ver1="30.0.0.0" ver2="30.0.0.1" />
+        <field name="Name" type="NiFixedString" />
+        <field name="Speed" type="float" />
+        <field name="Speed Var" type="float" />
+        <field name="Speed Flip Ratio" type="float" ver1="20.6.1.0" />
+        <field name="Declination" type="float" />
+        <field name="Declination Var" type="float" />
+        <field name="Planar Angle" type="float" />
+        <field name="Planar Angle Var" type="float" />
+        <field name="Color" type="ByteColor4" ver2="20.6.0.0" />
+        <field name="Size" type="float" />
+        <field name="Size Var" type="float" />
+        <field name="Lifespan" type="float" />
+        <field name="Lifespan Var" type="float" />
+        <field name="Rotation Angle" type="float" />
+        <field name="Rotation Angle Var" type="float" />
+        <field name="Rotation Speed" type="float" />
+        <field name="Rotation Speed Var" type="float" />
+        <field name="Rotation Axis" type="Vector3" />
+        <field name="Random Rot Speed Sign" type="bool" />
+        <field name="Random Rot Axis" type="bool" />
+        <field name="Unknown" type="bool" ver1="30.0.0.0" ver2="30.0.0.1" />
     </niobject>
 
     <niobject name="NiPSVolumeEmitter" abstract="true" inherit="NiPSEmitter" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for particle emitters that emit particles from a volume.
-        <add name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
-        <add name="Emitter Object" type="Ptr" template="NiAVObject" />
+        <field name="DEM Unknown Byte" type="byte" ver1="20.6.5.0" ver2="20.6.5.0" vercond="#USER# #GT# 14" />
+        <field name="Emitter Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPSBoxEmitter" inherit="NiPSVolumeEmitter" module="NiPSParticle" since="V20_5_0_0">
         A particle emitter that emits particles from a rectangular volume.
-        <add name="Emitter Width" type="float" />
-        <add name="Emitter Height" type="float" />
-        <add name="Emitter Depth" type="float" />
+        <field name="Emitter Width" type="float" />
+        <field name="Emitter Height" type="float" />
+        <field name="Emitter Depth" type="float" />
     </niobject>
 
     <niobject name="NiPSSphereEmitter" inherit="NiPSVolumeEmitter" module="NiPSParticle" since="V20_5_0_0">
         A particle emitter that emits particles from a spherical volume.
-        <add name="Emitter Radius" type="float" />
+        <field name="Emitter Radius" type="float" />
     </niobject>
 
     <niobject name="NiPSCylinderEmitter" inherit="NiPSVolumeEmitter" module="NiPSParticle" since="V20_5_0_0">
         A particle emitter that emits particles from a cylindrical volume.
-        <add name="Emitter Radius" type="float" />
-        <add name="Emitter Height" type="float" />
+        <field name="Emitter Radius" type="float" />
+        <field name="Emitter Height" type="float" />
     </niobject>
 
     <niobject name="NiPSTorusEmitter" inherit="NiPSVolumeEmitter" module="NiPSParticle" since="V20_5_0_0">
         A particle emitter that emits particles from a toroidal volume.
-        <add name="Emitter Radius" type="float" />
-        <add name="Emitter Section Radius" type="float" />
+        <field name="Emitter Radius" type="float" />
+        <field name="Emitter Section Radius" type="float" />
     </niobject>
 
     <niobject name="NiPSMeshEmitter" inherit="NiPSEmitter" module="NiPSParticle" since="V20_5_0_0">
         Emits particles from one or more NiMesh objects. A random mesh emitter is selected for each particle emission.
-        <add name="Num Mesh Emitters" type="uint" />
-        <add name="Mesh Emitters" type="Ptr" template="NiMesh" arr1="Num Mesh Emitters" />
-        <add name="Emit Axis" type="Vector3" ver2="20.6.0.0" />
-        <add name="Emitter Object" type="Ptr" template="NiAVObject" ver1="20.6.1.0" />
-        <add name="Mesh Emission Type" type="EmitFrom" />
-        <add name="Initial Velocity Type" type="VelocityType" />
+        <field name="Num Mesh Emitters" type="uint" />
+        <field name="Mesh Emitters" type="Ptr" template="NiMesh" arr1="Num Mesh Emitters" />
+        <field name="Emit Axis" type="Vector3" ver2="20.6.0.0" />
+        <field name="Emitter Object" type="Ptr" template="NiAVObject" ver1="20.6.1.0" />
+        <field name="Mesh Emission Type" type="EmitFrom" />
+        <field name="Initial Velocity Type" type="VelocityType" />
     </niobject>
 
     <niobject name="NiPSCurveEmitter" inherit="NiPSEmitter" module="NiPSParticle" since="V20_5_0_0">
         Emits particles from a curve.
-        <add name="Has Curve" type="bool" />
-        <add name="Curve" type="NiCurve3" cond="Has Curve" />
-        <add name="Curve Parent" type="Ptr" template="NiAVObject" />
-        <add name="Emitter Object" type="Ptr" template="NiAVObject" />
+        <field name="Has Curve" type="bool" />
+        <field name="Curve" type="NiCurve3" cond="Has Curve" />
+        <field name="Curve Parent" type="Ptr" template="NiAVObject" />
+        <field name="Emitter Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <!-- NiPS Controllers -->
 
     <niobject name="NiPSEmitterCtlr" abstract="true" inherit="NiSingleInterpController" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle emitter time controllers.
-        <add name="Emitter Name" type="NiFixedString" />
+        <field name="Emitter Name" type="NiFixedString" />
     </niobject>
 
     <niobject name="NiPSEmitterFloatCtlr" abstract="true" inherit="NiPSEmitterCtlr" module="NiPSParticle" since="V20_5_0_0">
@@ -7615,12 +7615,12 @@
 
     <niobject name="NiPSEmitParticlesCtlr" inherit="NiPSEmitterCtlr" module="NiPSParticle" since="V20_5_0_0">
         Animates particle emission and birth rate.
-        <add name="Emitter Active Interpolator" type="Ref" template="NiInterpolator" />
+        <field name="Emitter Active Interpolator" type="Ref" template="NiInterpolator" />
     </niobject>
 
     <niobject name="NiPSForceCtlr" abstract="true" inherit="NiSingleInterpController" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle force time controllers.
-        <add name="Force Name" type="NiFixedString" />
+        <field name="Force Name" type="NiFixedString" />
     </niobject>
 
     <niobject name="NiPSForceBoolCtlr" abstract="true" inherit="NiPSForceCtlr" module="NiPSParticle" since="V20_5_0_0">
@@ -7709,67 +7709,67 @@
 
     <niobject name="NiPSCollider" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Abstract base class for all particle colliders.
-        <add name="Spawner" type="Ref" template="NiPSSpawner" />
-        <add name="Type" type="ColliderType" />
-        <add name="Active" type="bool" />
-        <add name="Bounce" type="float" default="1.0" />
-        <add name="Spawn on Collide" type="bool" />
-        <add name="Die on Collide" type="bool" />
+        <field name="Spawner" type="Ref" template="NiPSSpawner" />
+        <field name="Type" type="ColliderType" />
+        <field name="Active" type="bool" />
+        <field name="Bounce" type="float" default="1.0" />
+        <field name="Spawn on Collide" type="bool" />
+        <field name="Die on Collide" type="bool" />
     </niobject>
 
     <niobject name="NiPSPlanarCollider" inherit="NiPSCollider" module="NiPSParticle" since="V20_5_0_0">
         A planar collider for particles.
-        <add name="Width" type="float" default="1.0" />
-        <add name="Height" type="float" default="1.0" />
-        <add name="X Axis" type="Vector3" default="#X_AXIS#" />
-        <add name="Y Axis" type="Vector3" default="#Y_AXIS#" />
-        <add name="Collider Object" type="Ptr" template="NiAVObject" />
+        <field name="Width" type="float" default="1.0" />
+        <field name="Height" type="float" default="1.0" />
+        <field name="X Axis" type="Vector3" default="#X_AXIS#" />
+        <field name="Y Axis" type="Vector3" default="#Y_AXIS#" />
+        <field name="Collider Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPSSphericalCollider" inherit="NiPSCollider" module="NiPSParticle" since="V20_5_0_0">
         A spherical collider for particles.
-        <add name="Radius" type="float" default="1.0" />
-        <add name="Collider Object" type="Ptr" template="NiAVObject" />
+        <field name="Radius" type="float" default="1.0" />
+        <field name="Collider Object" type="Ptr" template="NiAVObject" />
     </niobject>
 
     <niobject name="NiPSSpawner" inherit="NiObject" module="NiPSParticle" since="V20_5_0_0">
         Creates a new particle whose initial parameters are based on an existing particle.
-        <add name="Master Particle System" type="Ptr" template="NiPSParticleSystem" ver1="20.6.1.0" />
-        <add name="Percentage Spawned" type="float" default="1.0" />
-        <add name="Spawn Speed Factor" type="float" default="1.0" ver1="20.6.1.0" />
-        <add name="Spawn Speed Factor Var" type="float" />
-        <add name="Spawn Dir Chaos" type="float" />
-        <add name="Life Span" type="float" />
-        <add name="Life Span Var" type="float" />
-        <add name="Num Spawn Generations" type="ushort" default="1" />
-        <add name="Min to Spawn" type="uint" default="1" />
-        <add name="Max to Spawn" type="uint" default="1" />
+        <field name="Master Particle System" type="Ptr" template="NiPSParticleSystem" ver1="20.6.1.0" />
+        <field name="Percentage Spawned" type="float" default="1.0" />
+        <field name="Spawn Speed Factor" type="float" default="1.0" ver1="20.6.1.0" />
+        <field name="Spawn Speed Factor Var" type="float" />
+        <field name="Spawn Dir Chaos" type="float" />
+        <field name="Life Span" type="float" />
+        <field name="Life Span Var" type="float" />
+        <field name="Num Spawn Generations" type="ushort" default="1" />
+        <field name="Min to Spawn" type="uint" default="1" />
+        <field name="Max to Spawn" type="uint" default="1" />
     </niobject>
 
     <!-- NiPhysXPS -->
 
     <niobject name="NiPhysXPSParticleSystem" inherit="NiPSParticleSystem" module="NiPhysX" since="V20_5_0_0">
         Implements Gamebryo particle systems that use PhysX actors for the particles
-        <add name="Prop" type="Ptr" template="NiPhysXPSParticleSystemProp" />
-        <add name="Dest" type="Ptr" template="NiPhysXPSParticleSystemDest" />
-        <add name="Scene" type="Ptr" template="NiPhysXScene" />
-        <add name="PhysX Flags" type="byte" />
-        <add name="Default Actor Pool Size" type="uint" />
-        <add name="Generation Pool Size" type="uint" />
-        <add name="Actor Pool Center" type="Vector3" />
-        <add name="Actor Pool Dimensions" type="Vector3" />
-        <add name="Actor" type="Ptr" template="NiPhysXActorDesc" />
+        <field name="Prop" type="Ptr" template="NiPhysXPSParticleSystemProp" />
+        <field name="Dest" type="Ptr" template="NiPhysXPSParticleSystemDest" />
+        <field name="Scene" type="Ptr" template="NiPhysXScene" />
+        <field name="PhysX Flags" type="byte" />
+        <field name="Default Actor Pool Size" type="uint" />
+        <field name="Generation Pool Size" type="uint" />
+        <field name="Actor Pool Center" type="Vector3" />
+        <field name="Actor Pool Dimensions" type="Vector3" />
+        <field name="Actor" type="Ptr" template="NiPhysXActorDesc" />
     </niobject>
 
     <niobject name="NiPhysXPSParticleSystemProp" inherit="NiPhysXProp" module="NiPhysX" since="V20_5_0_0">
         A PhysX prop which holds information about a PhysX particle system prop.
-        <add name="Num Systems" type="uint" />
-        <add name="Systems" type="Ptr" template="NiPhysXPSParticleSystem" arr1="Num Systems" />
+        <field name="Num Systems" type="uint" />
+        <field name="Systems" type="Ptr" template="NiPhysXPSParticleSystem" arr1="Num Systems" />
     </niobject>
 
     <niobject name="NiPhysXPSParticleSystemDest" inherit="NiPhysXDest" module="NiPhysX" since="V20_5_0_0">
         An object which interfaces between the PhysX scene and the Gamebryo particle system.
-        <add name="Target" type="Ptr" template="NiPSParticleSystem" />
+        <field name="Target" type="Ptr" template="NiPSParticleSystem" />
     </niobject>
 
     <niobject name="NiPhysXPSSimulator" inherit="NiPSSimulator" module="NiPhysX" since="V20_5_0_0">
@@ -7787,141 +7787,141 @@
     <!-- NiEvaluator -->
 
     <niobject name="NiEvaluator" abstract="true" inherit="NiObject" module="NiAnimation" since="V20_5_0_0">
-        <add name="Node Name" type="NiFixedString">The name of the animated NiAVObject.</add>
-        <add name="Property Type" type="NiFixedString">The RTTI type of the NiProperty the controller is attached to, if applicable.</add>
-        <add name="Controller Type" type="NiFixedString">The RTTI type of the NiTimeController.</add>
-        <add name="Controller ID" type="NiFixedString">An ID that can uniquely identify the controller among others of the same type on the same NiObjectNET.</add>
-        <add name="Interpolator ID" type="NiFixedString">An ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</add>
-        <add name="Channel Types" type="byte" arr1="4">
+        <field name="Node Name" type="NiFixedString">The name of the animated NiAVObject.</field>
+        <field name="Property Type" type="NiFixedString">The RTTI type of the NiProperty the controller is attached to, if applicable.</field>
+        <field name="Controller Type" type="NiFixedString">The RTTI type of the NiTimeController.</field>
+        <field name="Controller ID" type="NiFixedString">An ID that can uniquely identify the controller among others of the same type on the same NiObjectNET.</field>
+        <field name="Interpolator ID" type="NiFixedString">An ID that can uniquely identify the interpolator among others of the same type on the same NiObjectNET.</field>
+        <field name="Channel Types" type="byte" arr1="4">
             Channel Indices are BASE/POS = 0, ROT = 1, SCALE = 2, FLAG = 3
             Channel Types are:
              INVALID = 0, COLOR, BOOL, FLOAT, POINT3, ROT = 5
             Any channel may be | 0x40 which means POSED
             The FLAG (3) channel flags affects the whole evaluator:
              REFERENCED = 0x1, TRANSFORM = 0x2, ALWAYSUPDATE = 0x4, SHUTDOWN = 0x8
-        </add>
+        </field>
     </niobject>
 
     <niobject name="NiKeyBasedEvaluator" abstract="true" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0" />
 
     <niobject name="NiBoolEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Data" type="Ref" template="NiBoolData" />
+        <field name="Data" type="Ref" template="NiBoolData" />
     </niobject>
 
     <niobject name="NiBoolTimelineEvaluator" inherit="NiBoolEvaluator" module="NiAnimation" since="V20_5_0_0" />
 
     <niobject name="NiColorEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Data" type="Ref" template="NiColorData" />
+        <field name="Data" type="Ref" template="NiColorData" />
     </niobject>
 
     <niobject name="NiFloatEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Data" type="Ref" template="NiFloatData" />
+        <field name="Data" type="Ref" template="NiFloatData" />
     </niobject>
 
     <niobject name="NiPoint3Evaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Data" type="Ref" template="NiPosData" />
+        <field name="Data" type="Ref" template="NiPosData" />
     </niobject>
 
     <niobject name="NiQuaternionEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Data" type="Ref" template="NiRotData" />
+        <field name="Data" type="Ref" template="NiRotData" />
     </niobject>
 
     <niobject name="NiTransformEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Value" type="NiQuatTransform" />
-        <add name="Data" type="Ref" template="NiTransformData" />
+        <field name="Value" type="NiQuatTransform" />
+        <field name="Data" type="Ref" template="NiTransformData" />
     </niobject>
 
     <niobject name="NiConstBoolEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Value" type="float" default="#INV_FLT#">For floating point as boolean, 0.0 indicates false and 1.0 indicates true.</add>
+        <field name="Value" type="float" default="#INV_FLT#">For floating point as boolean, 0.0 indicates false and 1.0 indicates true.</field>
     </niobject>
 
     <niobject name="NiConstColorEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Value" type="Color4" default="#INV_VEC4#" />
+        <field name="Value" type="Color4" default="#INV_VEC4#" />
     </niobject>
 
     <niobject name="NiConstFloatEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Value" type="float" default="#INV_FLT#" />
+        <field name="Value" type="float" default="#INV_FLT#" />
     </niobject>
 
     <niobject name="NiConstPoint3Evaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Value" type="Vector3" default="#INV_VEC3#" />
+        <field name="Value" type="Vector3" default="#INV_VEC3#" />
     </niobject>
 
     <niobject name="NiConstQuaternionEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Value" type="Quaternion" default="#INV_VEC4#" />
+        <field name="Value" type="Quaternion" default="#INV_VEC4#" />
     </niobject>
 
     <niobject name="NiConstTransformEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Value" type="NiQuatTransform" />
+        <field name="Value" type="NiQuatTransform" />
     </niobject>
 
     <niobject name="NiBSplineEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Start Time" type="float" default="#FLT_MAX#" />
-        <add name="End Time" type="float" default="#FLT_MIN#" />
-        <add name="Data" type="Ref" template="NiBSplineData" />
-        <add name="Basis Data" type="Ref" template="NiBSplineBasisData" />
+        <field name="Start Time" type="float" default="#FLT_MAX#" />
+        <field name="End Time" type="float" default="#FLT_MIN#" />
+        <field name="Data" type="Ref" template="NiBSplineData" />
+        <field name="Basis Data" type="Ref" template="NiBSplineBasisData" />
     </niobject>
 
     <niobject name="NiBSplineColorEvaluator" inherit="NiBSplineEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
+        <field name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</field>
     </niobject>
 
     <niobject name="NiBSplineCompColorEvaluator" inherit="NiBSplineColorEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Offset" type="float" default="#FLT_MAX#" />
-        <add name="Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Offset" type="float" default="#FLT_MAX#" />
+        <field name="Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiBSplineFloatEvaluator" inherit="NiBSplineEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
+        <field name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</field>
     </niobject>
 
     <niobject name="NiBSplineCompFloatEvaluator" inherit="NiBSplineFloatEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Offset" type="float" default="#FLT_MAX#" />
-        <add name="Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Offset" type="float" default="#FLT_MAX#" />
+        <field name="Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiBSplinePoint3Evaluator" inherit="NiBSplineEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</add>
+        <field name="Handle" type="uint" default="0xFFFF">Handle into the data. (USHRT_MAX for invalid handle.)</field>
     </niobject>
 
     <niobject name="NiBSplineCompPoint3Evaluator" inherit="NiBSplinePoint3Evaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Offset" type="float" default="#FLT_MAX#" />
-        <add name="Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Offset" type="float" default="#FLT_MAX#" />
+        <field name="Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiBSplineTransformEvaluator" inherit="NiBSplineEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Transform" type="NiQuatTransform" />
-        <add name="Translation Handle" type="uint" default="0xFFFF">Handle into the translation data. (USHRT_MAX for invalid handle.)</add>
-        <add name="Rotation Handle" type="uint" default="0xFFFF">Handle into the rotation data. (USHRT_MAX for invalid handle.)</add>
-        <add name="Scale Handle" type="uint" default="0xFFFF">Handle into the scale data. (USHRT_MAX for invalid handle.)</add>
+        <field name="Transform" type="NiQuatTransform" />
+        <field name="Translation Handle" type="uint" default="0xFFFF">Handle into the translation data. (USHRT_MAX for invalid handle.)</field>
+        <field name="Rotation Handle" type="uint" default="0xFFFF">Handle into the rotation data. (USHRT_MAX for invalid handle.)</field>
+        <field name="Scale Handle" type="uint" default="0xFFFF">Handle into the scale data. (USHRT_MAX for invalid handle.)</field>
     </niobject>
 
     <niobject name="NiBSplineCompTransformEvaluator" inherit="NiBSplineTransformEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Translation Offset" type="float" default="#FLT_MAX#" />
-        <add name="Translation Half Range" type="float" default="#FLT_MAX#" />
-        <add name="Rotation Offset" type="float" default="#FLT_MAX#" />
-        <add name="Rotation Half Range" type="float" default="#FLT_MAX#" />
-        <add name="Scale Offset" type="float" default="#FLT_MAX#" />
-        <add name="Scale Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Translation Offset" type="float" default="#FLT_MAX#" />
+        <field name="Translation Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Rotation Offset" type="float" default="#FLT_MAX#" />
+        <field name="Rotation Half Range" type="float" default="#FLT_MAX#" />
+        <field name="Scale Offset" type="float" default="#FLT_MAX#" />
+        <field name="Scale Half Range" type="float" default="#FLT_MAX#" />
     </niobject>
 
     <niobject name="NiLookAtEvaluator" inherit="NiEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Flags" type="LookAtFlags" />
-        <add name="Look At Name" type="NiFixedString" />
-        <add name="Driven Name" type="NiFixedString" />
-        <add name="Interpolator: Translation" type="Ref" template="NiPoint3Interpolator" />
-        <add name="Interpolator: Roll" type="Ref" template="NiFloatInterpolator" />
-        <add name="Interpolator: Scale" type="Ref" template="NiFloatInterpolator" />
+        <field name="Flags" type="LookAtFlags" />
+        <field name="Look At Name" type="NiFixedString" />
+        <field name="Driven Name" type="NiFixedString" />
+        <field name="Interpolator: Translation" type="Ref" template="NiPoint3Interpolator" />
+        <field name="Interpolator: Roll" type="Ref" template="NiFloatInterpolator" />
+        <field name="Interpolator: Scale" type="Ref" template="NiFloatInterpolator" />
     </niobject>
 
     <niobject name="NiPathEvaluator" inherit="NiKeyBasedEvaluator" module="NiAnimation" since="V20_5_0_0">
-        <add name="Flags" type="PathFlags" default="3" />
-        <add name="Bank Dir" type="int" default="1">-1 = Negative, 1 = Positive</add>
-        <add name="Max Bank Angle" type="float">Max angle in radians.</add>
-        <add name="Smoothing" type="float" />
-        <add name="Follow Axis" type="short">0, 1, or 2 representing X, Y, or Z.</add>
-        <add name="Path Data" type="Ref" template="NiPosData" />
-        <add name="Percent Data" type="Ref" template="NiFloatData" />
+        <field name="Flags" type="PathFlags" default="3" />
+        <field name="Bank Dir" type="int" default="1">-1 = Negative, 1 = Positive</field>
+        <field name="Max Bank Angle" type="float">Max angle in radians.</field>
+        <field name="Smoothing" type="float" />
+        <field name="Follow Axis" type="short">0, 1, or 2 representing X, Y, or Z.</field>
+        <field name="Path Data" type="Ref" template="NiPosData" />
+        <field name="Percent Data" type="Ref" template="NiFloatData" />
     </niobject>
 
     <niobject name="NiSequenceData" inherit="NiObject" module="NiAnimation" since="V20_5_0_0">
@@ -7929,18 +7929,18 @@
         For 20.5.0.0, "NiSequenceData" is an alias for "NiControllerSequence" and this is not handled in nifxml.
         This was not found in any 20.5.0.0 KFs available and they instead use NiControllerSequence directly.
         After 20.5.0.1, Controlled Blocks are no longer used and instead the sequences uses NiEvaluator.
-        <add name="Name" type="NiFixedString" />
-        <add name="Num Controlled Blocks" type="uint" ver2="20.5.0.1" />
-        <add name="Array Grow By" type="uint" ver2="20.5.0.1" />
-        <add name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" ver2="20.5.0.1" />
-        <add name="Num Evaluators" type="uint" ver1="20.5.0.2" />
-        <add name="Evaluators" type="Ref" template="NiEvaluator" arr1="Num Evaluators" ver1="20.5.0.2" />
-        <add name="Text Keys" type="Ref" template="NiTextKeyExtraData" />
-        <add name="Duration" type="float" />
-        <add name="Cycle Type" type="CycleType" />
-        <add name="Frequency" type="float" default="1.0" />
-        <add name="Accum Root Name" type="NiFixedString">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</add>
-        <add name="Accum Flags" type="AccumFlags" default="ACCUM_X_FRONT" />
+        <field name="Name" type="NiFixedString" />
+        <field name="Num Controlled Blocks" type="uint" ver2="20.5.0.1" />
+        <field name="Array Grow By" type="uint" ver2="20.5.0.1" />
+        <field name="Controlled Blocks" type="ControlledBlock" arr1="Num Controlled Blocks" ver2="20.5.0.1" />
+        <field name="Num Evaluators" type="uint" ver1="20.5.0.2" />
+        <field name="Evaluators" type="Ref" template="NiEvaluator" arr1="Num Evaluators" ver1="20.5.0.2" />
+        <field name="Text Keys" type="Ref" template="NiTextKeyExtraData" />
+        <field name="Duration" type="float" />
+        <field name="Cycle Type" type="CycleType" />
+        <field name="Frequency" type="float" default="1.0" />
+        <field name="Accum Root Name" type="NiFixedString">The name of the NiAVObject serving as the accumulation root. This is where all accumulated translations, scales, and rotations are applied.</field>
+        <field name="Accum Flags" type="AccumFlags" default="ACCUM_X_FRONT" />
     </niobject>
 
     <bitflags name="NiShadowGeneratorFlags" storage="ushort">
@@ -7962,50 +7962,50 @@
 
     <niobject name="NiShadowGenerator" inherit="NiObject" module="NiMain">
         An NiShadowGenerator object is attached to an NiDynamicEffect object to inform the shadowing system that the effect produces shadows.
-        <add name="Name" type="string" default="NiStandardShadowTechnique" />
-        <add name="Flags" type="NiShadowGeneratorFlags" default="0x3DB" />
-        <add name="Num Shadow Casters" type="uint" />
-        <add name="Shadow Casters" type="Ref" template="NiNode" arr1="Num Shadow Casters" />
-        <add name="Num Shadow Receivers" type="uint" />
-        <add name="Shadow Receivers" type="Ref" template="NiNode" arr1="Num Shadow Receivers" />
-        <add name="Target" type="Ptr" template="NiDynamicEffect" />
-        <add name="Depth Bias" type="float" />
-        <add name="Size Hint" type="ushort" default="1024" />
-        <add name="Near Clipping Distance" type="float" ver1="20.3.0.7" />
-        <add name="Far Clipping Distance" type="float" ver1="20.3.0.7" />
-        <add name="Directional Light Frustum Width" type="float" ver1="20.3.0.7" />
+        <field name="Name" type="string" default="NiStandardShadowTechnique" />
+        <field name="Flags" type="NiShadowGeneratorFlags" default="0x3DB" />
+        <field name="Num Shadow Casters" type="uint" />
+        <field name="Shadow Casters" type="Ref" template="NiNode" arr1="Num Shadow Casters" />
+        <field name="Num Shadow Receivers" type="uint" />
+        <field name="Shadow Receivers" type="Ref" template="NiNode" arr1="Num Shadow Receivers" />
+        <field name="Target" type="Ptr" template="NiDynamicEffect" />
+        <field name="Depth Bias" type="float" />
+        <field name="Size Hint" type="ushort" default="1024" />
+        <field name="Near Clipping Distance" type="float" ver1="20.3.0.7" />
+        <field name="Far Clipping Distance" type="float" ver1="20.3.0.7" />
+        <field name="Directional Light Frustum Width" type="float" ver1="20.3.0.7" />
     </niobject>
 
     <niobject name="NiFurSpringController" inherit="NiTimeController" module="NiCustom" versions="V10_2_0_0__1">
         Blood Bowl Specific
         Used on things like hair/tails in conjunction with bones to animate them.
-        <add name="Unknown Float" type="float"></add>
-        <add name="Unknown Float 2" type="float"></add>
-        <add name="Num Bones" type="uint">The number of node bones referenced as influences.</add>
-        <add name="Bones" type="Ptr" template="NiNode" arr1="Num Bones">List of all armature bones.</add>
-        <add name="Num Bones 2" type="uint">The number of node bones referenced as influences.</add>
-        <add name="Bones 2" type="Ptr" template="NiNode" arr1="Num Bones 2">List of all armature bones.</add>
+        <field name="Unknown Float" type="float"></field>
+        <field name="Unknown Float 2" type="float"></field>
+        <field name="Num Bones" type="uint">The number of node bones referenced as influences.</field>
+        <field name="Bones" type="Ptr" template="NiNode" arr1="Num Bones">List of all armature bones.</field>
+        <field name="Num Bones 2" type="uint">The number of node bones referenced as influences.</field>
+        <field name="Bones 2" type="Ptr" template="NiNode" arr1="Num Bones 2">List of all armature bones.</field>
     </niobject>
 
     <niobject name="CStreamableAssetData" inherit="NiObject" module="NiCustom" versions="V20_3_0_9 V20_3_0_9_DIV2">
         Divinity 2 specific block
-        <add name="Root" type="Ref" template="NiNode" />
-        <add name="Has Data" type="bool" />
-        <add name="Data" type="ByteArray" cond="Has Data" />
-        <add name="Num Refs" type="uint" />
-        <add name="Refs" type="Ref" template="NiObject" arr1="Num Refs" />
+        <field name="Root" type="Ref" template="NiNode" />
+        <field name="Has Data" type="bool" />
+        <field name="Data" type="ByteArray" cond="Has Data" />
+        <field name="Num Refs" type="uint" />
+        <field name="Refs" type="Ref" template="NiObject" arr1="Num Refs" />
     </niobject>
 
     <niobject name="bhkCompressedMeshShape" inherit="bhkShape" module="BSHavok" versions="#SKY_AND_LATER#">
         Compressed collision mesh.
-        <add name="Target" type="Ptr" template="NiAVObject">Points to root node?</add>
-        <add name="User Data" type="uint" />
-        <add name="Radius" type="float" default="0.005">A shell that is added around the shape.</add>
-        <add name="Unknown Float 1" type="float" />
-        <add name="Scale" type="Vector4" default="#VEC4_1110#">Scale</add>
-        <add name="Radius Copy" type="float" default="0.005">A shell that is added around the shape.</add>
-        <add name="Scale Copy" type="Vector4" default="#VEC4_1110#">Scale</add>
-        <add name="Data" type="Ref" template="bhkCompressedMeshShapeData">The collision mesh data.</add>
+        <field name="Target" type="Ptr" template="NiAVObject">Points to root node?</field>
+        <field name="User Data" type="uint" />
+        <field name="Radius" type="float" default="0.005">A shell that is added around the shape.</field>
+        <field name="Unknown Float 1" type="float" />
+        <field name="Scale" type="Vector4" default="#VEC4_1110#">Scale</field>
+        <field name="Radius Copy" type="float" default="0.005">A shell that is added around the shape.</field>
+        <field name="Scale Copy" type="Vector4" default="#VEC4_1110#">Scale</field>
+        <field name="Data" type="Ref" template="bhkCompressedMeshShapeData">The collision mesh data.</field>
     </niobject>
 
     <enum name="hkWeldingType" storage="byte" prefix="WT">
@@ -8026,32 +8026,32 @@
 
     <niobject name="bhkCompressedMeshShapeData" inherit="bhkRefObject" module="BSHavok" versions="#SKY_AND_LATER#">
          A compressed mesh shape for collision in Skyrim.
-		<add name="Bits Per Index" type="uint" default="17">Number of bits in the shape-key reserved for a triangle index</add>
-		<add name="Bits Per W Index" type="uint" default="18">Number of bits in the shape-key reserved for a triangle index and its winding</add>
-		<add name="Mask W Index" type="uint" default="0x3FFFF">Mask used to get the triangle index and winding from a shape-key/</add>
-		<add name="Mask Index" type="uint" default="0x1FFFF">Mask used to get the triangle index from a shape-key.</add>
-		<add name="Error" type="float" default="0.001">Quantization error.</add>
-		<add name="AABB" type="hkAabb" />
-		<add name="Welding Type" type="hkWeldingType" default="ANTICLOCKWISE" />
-		<add name="Material Type" type="bhkCMSMatType" default="SINGLE_VALUE_PER_CHUNK" />
-		<add name="Num Materials 32" type="uint" />
-		<add name="Materials 32" type="uint" arr1="Num Materials 32">Unused.</add>
-		<add name="Num Materials 16" type="uint" />
-		<add name="Materials 16" type="uint" arr1="Num Materials 16">Unused.</add>
-		<add name="Num Materials 8" type="uint" />
-		<add name="Materials 8" type="uint" arr1="Num Materials 8">Unused.</add>
-		<add name="Num Materials" type="uint" default="1" />
-		<add name="Chunk Materials" type="bhkMeshMaterial" arr1="Num Materials">Materials used by Chunks. Chunks refer to this table by index.</add>
-		<add name="Num Named Materials" type="uint">Number of hkpNamedMeshMaterial. Unused.</add>
-		<add name="Num Transforms" type="uint" default="1">Number of chunk transformations</add>
-        <add name="Chunk Transforms" type="bhkQsTransform" arr1="Num Transforms">Transforms used by Chunks. Chunks refer to this table by index.</add>
-		<add name="Num Big Verts" type="uint" />
-		<add name="Big Verts" type="Vector4" arr1="Num Big Verts">Vertices paired with Big Tris (triangles that are too large for chunks)</add>
-        <add name="Num Big Tris" type="uint" />
-        <add name="Big Tris" type="bhkCMSBigTri" arr1="Num Big Tris">Triangles that are too large to fit in a chunk.</add>
-        <add name="Num Chunks" type="uint" default="1" />
-        <add name="Chunks" type="bhkCMSChunk" arr1="Num Chunks" />
-        <add name="Num Convex Piece A" type="uint">Number of hkpCompressedMeshShape::ConvexPiece. Unused.</add>
+		<field name="Bits Per Index" type="uint" default="17">Number of bits in the shape-key reserved for a triangle index</field>
+		<field name="Bits Per W Index" type="uint" default="18">Number of bits in the shape-key reserved for a triangle index and its winding</field>
+		<field name="Mask W Index" type="uint" default="0x3FFFF">Mask used to get the triangle index and winding from a shape-key/</field>
+		<field name="Mask Index" type="uint" default="0x1FFFF">Mask used to get the triangle index from a shape-key.</field>
+		<field name="Error" type="float" default="0.001">Quantization error.</field>
+		<field name="AABB" type="hkAabb" />
+		<field name="Welding Type" type="hkWeldingType" default="ANTICLOCKWISE" />
+		<field name="Material Type" type="bhkCMSMatType" default="SINGLE_VALUE_PER_CHUNK" />
+		<field name="Num Materials 32" type="uint" />
+		<field name="Materials 32" type="uint" arr1="Num Materials 32">Unused.</field>
+		<field name="Num Materials 16" type="uint" />
+		<field name="Materials 16" type="uint" arr1="Num Materials 16">Unused.</field>
+		<field name="Num Materials 8" type="uint" />
+		<field name="Materials 8" type="uint" arr1="Num Materials 8">Unused.</field>
+		<field name="Num Materials" type="uint" default="1" />
+		<field name="Chunk Materials" type="bhkMeshMaterial" arr1="Num Materials">Materials used by Chunks. Chunks refer to this table by index.</field>
+		<field name="Num Named Materials" type="uint">Number of hkpNamedMeshMaterial. Unused.</field>
+		<field name="Num Transforms" type="uint" default="1">Number of chunk transformations</field>
+        <field name="Chunk Transforms" type="bhkQsTransform" arr1="Num Transforms">Transforms used by Chunks. Chunks refer to this table by index.</field>
+		<field name="Num Big Verts" type="uint" />
+		<field name="Big Verts" type="Vector4" arr1="Num Big Verts">Vertices paired with Big Tris (triangles that are too large for chunks)</field>
+        <field name="Num Big Tris" type="uint" />
+        <field name="Big Tris" type="bhkCMSBigTri" arr1="Num Big Tris">Triangles that are too large to fit in a chunk.</field>
+        <field name="Num Chunks" type="uint" default="1" />
+        <field name="Chunks" type="bhkCMSChunk" arr1="Num Chunks" />
+        <field name="Num Convex Piece A" type="uint">Number of hkpCompressedMeshShape::ConvexPiece. Unused.</field>
 	</niobject>
 	
     <niobject name="BSInvMarker" inherit="NiExtraData" module="BSMain" versions="#SKY_AND_LATER#">
@@ -8062,36 +8062,36 @@
         using the default values.
         Name should be 'INV' (without the quotes).
         For rotations, a short of "4712" appears as "4.712" but "959" appears as "0.959"  meshes\weapons\daedric\daedricbowskinned.nif
-        <add name="Rotation X" type="ushort" default="4712"></add>
-        <add name="Rotation Y" type="ushort" default="6283"></add>
-        <add name="Rotation Z" type="ushort" default="0"></add>
-        <add name="Zoom" type="float" default="1.0">Zoom factor.</add>
+        <field name="Rotation X" type="ushort" default="4712"></field>
+        <field name="Rotation Y" type="ushort" default="6283"></field>
+        <field name="Rotation Z" type="ushort" default="0"></field>
+        <field name="Zoom" type="float" default="1.0">Zoom factor.</field>
     </niobject>
 
 	<niobject name="BSBoneLODExtraData" inherit="NiExtraData" module="BSMain" versions="#SKY_AND_LATER#">
     Unknown
-		<add name="BoneLOD Count" type="uint" default="3">Number of bone entries</add>
-        <add name="BoneLOD Info" type="BoneLOD" arr1="BoneLOD Count">Bone Entry</add>
+		<field name="BoneLOD Count" type="uint" default="3">Number of bone entries</field>
+        <field name="BoneLOD Info" type="BoneLOD" arr1="BoneLOD Count">Bone Entry</field>
 	</niobject>
 	
 	<niobject name="BSBehaviorGraphExtraData" inherit="NiExtraData" module="BSMain" versions="#SKY_AND_LATER#">
     Links a nif with a Havok Behavior .hkx animation file
-		<add name="Behaviour Graph File" type="NiFixedString">Name of the hkx file.</add>
-		<add name="Controls Base Skeleton" type="bool">Unknown, has to do with blending appended bones onto an actor.</add>
+		<field name="Behaviour Graph File" type="NiFixedString">Name of the hkx file.</field>
+		<field name="Controls Base Skeleton" type="bool">Unknown, has to do with blending appended bones onto an actor.</field>
 	</niobject>
 
 	<niobject name="BSLagBoneController" inherit="NiTimeController" module="BSAnimation" versions="#SKY_AND_LATER#">
     A controller that trails a bone behind an actor.
-		<add name="Linear Velocity" type="float" default="3.0" range="0.0:500.0">How long it takes to rotate about an actor back to rest position.</add>
-		<add name="Linear Rotation" type="float" default="1.0" range="0.0:15.0">How the bone lags rotation</add>
-		<add name="Maximum Distance" type="float" default="400.0" range="#F0_1000#">How far bone will tail an actor.</add>
+		<field name="Linear Velocity" type="float" default="3.0" range="0.0:500.0">How long it takes to rotate about an actor back to rest position.</field>
+		<field name="Linear Rotation" type="float" default="1.0" range="0.0:15.0">How the bone lags rotation</field>
+		<field name="Maximum Distance" type="float" default="400.0" range="#F0_1000#">How far bone will tail an actor.</field>
 	</niobject>
 
 	<niobject name="BSLODTriShape" inherit="NiTriBasedGeom" module="BSMain" versions="#SKY# #SSE#">
 		A variation on NiTriShape, for visibility control over vertex groups.
-		<add name="LOD0 Size" type="uint" />
-		<add name="LOD1 Size" type="uint" />
-		<add name="LOD2 Size" type="uint" />
+		<field name="LOD0 Size" type="uint" />
+		<field name="LOD1 Size" type="uint" />
+		<field name="LOD2 Size" type="uint" />
 	</niobject>
 
 	<niobject name="BSFurnitureMarkerNode" inherit="BSFurnitureMarker" module="BSMain" versions="#SKY_AND_LATER#">
@@ -8104,10 +8104,10 @@
     
     <niobject name="BSTreeNode" inherit="NiNode" module="BSMain" versions="#BETHESDA#">
         Node for handling Trees, Switches branch configurations for variation?
-        <add name="Num Bones 1" type="uint" default="1" />
-        <add name="Bones 1" type="Ref" arr1="Num Bones 1" template="NiNode" />
-        <add name="Num Bones 2" type="uint" default="3" />
-        <add name="Bones" type="Ref" arr1="Num Bones 2" template="NiNode" />
+        <field name="Num Bones 1" type="uint" default="1" />
+        <field name="Bones 1" type="Ref" arr1="Num Bones 1" template="NiNode" />
+        <field name="Num Bones 2" type="uint" default="3" />
+        <field name="Bones" type="Ref" arr1="Num Bones 2" template="NiNode" />
     </niobject>
     
     
@@ -8115,56 +8115,56 @@
     
     <niobject name="BSTriShape" inherit="NiAVObject" module="BSMain" versions="#SSE# #FO4# #F76#">
         Fallout 4 Tri Shape
-        <add name="Bounding Sphere" type="NiBound" />
-        <add name="Bound Min Max" type="float" arr1="6" vercond="#BS_F76#" />
-        <add name="Skin" type="Ref" template="NiObject" />
-        <add name="Shader Property" type="Ref" template="BSShaderProperty" />
-        <add name="Alpha Property" type="Ref" template="NiAlphaProperty" />
-        <add name="Vertex Desc" type="BSVertexDesc" />
-        <add name="Num Triangles" type="uint" vercond="#BS_GTE_FO4#" />
-        <add name="Num Triangles" type="ushort" vercond="#NI_BS_LT_FO4#" />
-        <add name="Num Vertices" type="ushort" />
-        <add name="Data Size" type="uint" calc="((Vertex Desc #BITAND# 0xF) #MUL# Num Vertices #MUL# 4) #ADD# (Num Triangles #MUL# 6)" />
-        <add name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc #RSH# 44" cond="Data Size #GT# 0" vercond="#BS_GTE_FO4#" />
-        <add name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc #RSH# 44" cond="Data Size #GT# 0" vercond="#BS_SSE#" />
-        <add name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size #GT# 0" />
-        <add name="Particle Data Size" type="uint" calc="(Num Vertices #MUL# 6) #ADD# (Num Triangles #MUL# 3)" vercond="#BS_SSE#" />
-        <add name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
-        <add name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
-        <add name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
+        <field name="Bounding Sphere" type="NiBound" />
+        <field name="Bound Min Max" type="float" arr1="6" vercond="#BS_F76#" />
+        <field name="Skin" type="Ref" template="NiObject" />
+        <field name="Shader Property" type="Ref" template="BSShaderProperty" />
+        <field name="Alpha Property" type="Ref" template="NiAlphaProperty" />
+        <field name="Vertex Desc" type="BSVertexDesc" />
+        <field name="Num Triangles" type="uint" vercond="#BS_GTE_FO4#" />
+        <field name="Num Triangles" type="ushort" vercond="#NI_BS_LT_FO4#" />
+        <field name="Num Vertices" type="ushort" />
+        <field name="Data Size" type="uint" calc="((Vertex Desc #BITAND# 0xF) #MUL# Num Vertices #MUL# 4) #ADD# (Num Triangles #MUL# 6)" />
+        <field name="Vertex Data" type="BSVertexData" arr1="Num Vertices" arg="Vertex Desc #RSH# 44" cond="Data Size #GT# 0" vercond="#BS_GTE_FO4#" />
+        <field name="Vertex Data" type="BSVertexDataSSE" arr1="Num Vertices" arg="Vertex Desc #RSH# 44" cond="Data Size #GT# 0" vercond="#BS_SSE#" />
+        <field name="Triangles" type="Triangle" arr1="Num Triangles" cond="Data Size #GT# 0" />
+        <field name="Particle Data Size" type="uint" calc="(Num Vertices #MUL# 6) #ADD# (Num Triangles #MUL# 3)" vercond="#BS_SSE#" />
+        <field name="Particle Vertices" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
+        <field name="Particle Normals" type="HalfVector3" arr1="Num Vertices" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
+        <field name="Particle Triangles" type="Triangle" arr1="Num Triangles" cond="Particle Data Size #GT# 0" vercond="#BS_SSE#" />
     </niobject>
 
     <niobject name="BSMeshLODTriShape" inherit="BSTriShape" module="BSMain" versions="#FO4#">
         Fallout 4 LOD Tri Shape
-        <add name="LOD0 Size" type="uint" />
-        <add name="LOD1 Size" type="uint" />
-        <add name="LOD2 Size" type="uint" />
+        <field name="LOD0 Size" type="uint" />
+        <field name="LOD1 Size" type="uint" />
+        <field name="LOD2 Size" type="uint" />
     </niobject>
     
     <compound name="BSGeometryPerSegmentSharedData" size="16" versions="#FO4# #F76#">
-        <add name="User Index" type="uint">If Bone ID is 0xffffffff, this value refers to the Segment at the listed index. Otherwise this is the "Biped Object", which is like the body part types in Skyrim and earlier.</add>
-        <add name="Bone ID" type="uint" default="#UINT_MAX#">A hash of the bone name string.</add>
-        <add name="Num Cut Offsets" type="uint" range="0:8">Maximum of 8.</add>
-        <add name="Cut Offsets" type="float" arr1="Num Cut Offsets" />
+        <field name="User Index" type="uint">If Bone ID is 0xffffffff, this value refers to the Segment at the listed index. Otherwise this is the "Biped Object", which is like the body part types in Skyrim and earlier.</field>
+        <field name="Bone ID" type="uint" default="#UINT_MAX#">A hash of the bone name string.</field>
+        <field name="Num Cut Offsets" type="uint" range="0:8">Maximum of 8.</field>
+        <field name="Cut Offsets" type="float" arr1="Num Cut Offsets" />
     </compound>
 
     <compound name="BSGeometrySegmentSharedData" versions="#FO4# #F76#">
-        <add name="Num Segments" type="uint" />
-        <add name="Total Segments" type="uint" />
-        <add name="Segment Starts" type="uint" arr1="Num Segments" />
-        <add name="Per Segment Data" type="BSGeometryPerSegmentSharedData" arr1="Total Segments" />>
-        <add name="SSF File" type="SizedString16" />
+        <field name="Num Segments" type="uint" />
+        <field name="Total Segments" type="uint" />
+        <field name="Segment Starts" type="uint" arr1="Num Segments" />
+        <field name="Per Segment Data" type="BSGeometryPerSegmentSharedData" arr1="Total Segments" />>
+        <field name="SSF File" type="SizedString16" />
     </compound>
 
     <niobject name="BSSubIndexTriShape" inherit="BSTriShape" module="BSMain" versions="#SSE# #FO4# #F76#">
         Fallout 4 Sub-Index Tri Shape
-		<add name="Num Primitives" type="uint" calc="#LEN[Triangles]#" vercond="#BS_GTE_FO4#" cond="Data Size #GT# 0" />
-		<add name="Num Segments" type="uint" vercond="#BS_GTE_FO4#" cond="Data Size #GT# 0" />
-		<add name="Total Segments" type="uint" vercond="#BS_GTE_FO4#" cond="Data Size #GT# 0" />
-		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_GTE_FO4#" arr1="Num Segments" cond="Data Size #GT# 0" />
-		<add name="Segment Data" type="BSGeometrySegmentSharedData" vercond="#BS_GTE_FO4#" cond="(Num Segments #LT# Total Segments) #AND# (Data Size #GT# 0)" />
-		<add name="Num Segments" type="uint" vercond="#BS_SSE#" />
-		<add name="Segment" type="BSGeometrySegmentData" vercond="#BS_SSE#" arr1="Num Segments" />
+		<field name="Num Primitives" type="uint" calc="#LEN[Triangles]#" vercond="#BS_GTE_FO4#" cond="Data Size #GT# 0" />
+		<field name="Num Segments" type="uint" vercond="#BS_GTE_FO4#" cond="Data Size #GT# 0" />
+		<field name="Total Segments" type="uint" vercond="#BS_GTE_FO4#" cond="Data Size #GT# 0" />
+		<field name="Segment" type="BSGeometrySegmentData" vercond="#BS_GTE_FO4#" arr1="Num Segments" cond="Data Size #GT# 0" />
+		<field name="Segment Data" type="BSGeometrySegmentSharedData" vercond="#BS_GTE_FO4#" cond="(Num Segments #LT# Total Segments) #AND# (Data Size #GT# 0)" />
+		<field name="Num Segments" type="uint" vercond="#BS_SSE#" />
+		<field name="Segment" type="BSGeometrySegmentData" vercond="#BS_SSE#" arr1="Num Segments" />
     </niobject>
     
     <!-- Fallout 4 Physics -->
@@ -8175,21 +8175,21 @@
 
     <niobject name="bhkNPCollisionObject" inherit="NiCollisionObject" module="BSHavok" versions="#FO4# #F76#">
         Fallout 4 Collision Object
-        <add name="Flags" type="bhkCOFlags" default="0x80">
+        <field name="Flags" type="bhkCOFlags" default="0x80">
             Note: The CK Preview scenegraph reports these bits incorrectly.
-        </add>
-        <add name="Data" type="Ref" template="bhkSystem" />
-        <add name="Body ID" type="uint" />
+        </field>
+        <field name="Data" type="Ref" template="bhkSystem" />
+        <field name="Body ID" type="uint" />
     </niobject>
     
     <niobject name="bhkPhysicsSystem" inherit="bhkSystem" module="BSHavok" versions="#FO4# #F76#">
         Fallout 4 Collision System
-        <add name="Binary Data" type="ByteArray" />
+        <field name="Binary Data" type="ByteArray" />
     </niobject>
 
     <niobject name="bhkRagdollSystem" inherit="bhkSystem" module="BSHavok" versions="#FO4# #F76#">
         Fallout 4 Ragdoll System
-        <add name="Binary Data" type="ByteArray" />
+        <field name="Binary Data" type="ByteArray" />
     </niobject>
 
     <niobject name="BSExtraData" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
@@ -8198,133 +8198,133 @@
 
     <niobject name="BSClothExtraData" inherit="BSExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Cloth data
-        <add name="Binary Data" type="ByteArray" />
+        <field name="Binary Data" type="ByteArray" />
     </niobject>
     
     <!-- Fallout 4 Skeleton -->
 
     <compound name="BSSkinBoneTrans" size="68" versions="#FO4# #F76#">
         Fallout 4 Bone Transform
-        <add name="Bounding Sphere" type="NiBound" />
-        <add name="Rotation" type="Matrix33" />
-        <add name="Translation" type="Vector3" />
-        <add name="Scale" type="float" />
+        <field name="Bounding Sphere" type="NiBound" />
+        <field name="Rotation" type="Matrix33" />
+        <field name="Translation" type="Vector3" />
+        <field name="Scale" type="float" />
     </compound>
 
     <niobject name="BSSkin::Instance" inherit="NiObject" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Skin Instance
-        <add name="Skeleton Root" type="Ptr" template="NiAVObject" />
-        <add name="Data" type="Ref" template="BSSkin::BoneData" />
-        <add name="Num Bones" type="uint" />
-        <add name="Bones" type="Ptr" template="NiNode" arr1="Num Bones" />
-        <add name="Num Scales" type="uint" />
-        <add name="Scales" type="Vector3" arr1="Num Scales" />
+        <field name="Skeleton Root" type="Ptr" template="NiAVObject" />
+        <field name="Data" type="Ref" template="BSSkin::BoneData" />
+        <field name="Num Bones" type="uint" />
+        <field name="Bones" type="Ptr" template="NiNode" arr1="Num Bones" />
+        <field name="Num Scales" type="uint" />
+        <field name="Scales" type="Vector3" arr1="Num Scales" />
     </niobject>
 
     <niobject name="BSSkin::BoneData" inherit="NiObject" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Bone Data
-        <add name="Num Bones" type="uint" />
-        <add name="Bone List" type="BSSkinBoneTrans" arr1="Num Bones" />
+        <field name="Num Bones" type="uint" />
+        <field name="Bone List" type="BSSkinBoneTrans" arr1="Num Bones" />
     </niobject>
 
     <niobject name="BSPositionData" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Positional Data
-        <add name="Num Data" type="uint" />
-        <add name="Data" type="hfloat" arr1="Num Data" />
+        <field name="Num Data" type="uint" />
+        <field name="Data" type="hfloat" arr1="Num Data" />
     </niobject>
 
     <compound name="BSConnectPoint" versions="#FO4# #F76#">
-        <add name="Parent" type="SizedString" default="WorkshopConnectPoints" />
-        <add name="Name" type="SizedString" />
-        <add name="Rotation" type="Quaternion" />
-        <add name="Translation" type="Vector3" />
-        <add name="Scale" type="float" default="1.0" />
+        <field name="Parent" type="SizedString" default="WorkshopConnectPoints" />
+        <field name="Name" type="SizedString" />
+        <field name="Rotation" type="Quaternion" />
+        <field name="Translation" type="Vector3" />
+        <field name="Scale" type="float" default="1.0" />
     </compound>
 
     <niobject name="BSConnectPoint::Parents" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Item Slot Parent
-        <add name="Num Connect Points" type="uint" default="1" />
-        <add name="Connect Points" type="BSConnectPoint" arr1="Num Connect Points" />
+        <field name="Num Connect Points" type="uint" default="1" />
+        <field name="Connect Points" type="BSConnectPoint" arr1="Num Connect Points" />
     </niobject>
 
     <niobject name="BSConnectPoint::Children" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Item Slot Child
-        <add name="Skinned" type="bool" />
-        <add name="Num Points" type="uint" default="1" />
-        <add name="Point Name" type="SizedString" arr1="Num Points" />
+        <field name="Skinned" type="bool" />
+        <field name="Num Points" type="uint" default="1" />
+        <field name="Point Name" type="SizedString" arr1="Num Points" />
     </niobject>
     
     <niobject name="BSEyeCenterExtraData" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Eye Center Data
-        <add name="Num Data" type="uint" />
-        <add name="Data" type="float" arr1="Num Data" />
+        <field name="Num Data" type="uint" />
+        <field name="Data" type="float" arr1="Num Data" />
     </niobject>
 	
     <compound name="BSPackedGeomDataCombined" size="72" versions="#FO4# #F76#">
-        <add name="Grayscale to Palette Scale" type="float" />
-        <add name="Transform" type="NiTransform" />
-        <add name="Bounding Sphere" type="NiBound" />
+        <field name="Grayscale to Palette Scale" type="float" />
+        <field name="Transform" type="NiTransform" />
+        <field name="Bounding Sphere" type="NiBound" />
     </compound>
 
     <compound name="BSPackedGeomData" versions="#FO4# #F76#">
-        <add name="Num Verts" type="uint" />
-        <add name="LOD Levels" type="uint" />
-        <add name="Tri Count LOD0" type="uint" />
-        <add name="Tri Offset LOD0" type="uint" />
-        <add name="Tri Count LOD1" type="uint" />
-        <add name="Tri Offset LOD1" type="uint" />
-        <add name="Tri Count LOD2" type="uint" />
-        <add name="Tri Offset LOD2" type="uint" />
-        <add name="Num Combined" type="uint" />
-        <add name="Combined" type="BSPackedGeomDataCombined" arr1="Num Combined" />
-        <add name="Vertex Desc" type="BSVertexDesc" />
-        <add name="Vertex Data" type="BSVertexData" arr1="Num Verts" arg="Vertex Desc #RSH# 44" />
-        <add name="Triangles" type="Triangle" arr1="Tri Count LOD0 + Tri Count LOD1 + Tri Count LOD2" />
+        <field name="Num Verts" type="uint" />
+        <field name="LOD Levels" type="uint" />
+        <field name="Tri Count LOD0" type="uint" />
+        <field name="Tri Offset LOD0" type="uint" />
+        <field name="Tri Count LOD1" type="uint" />
+        <field name="Tri Offset LOD1" type="uint" />
+        <field name="Tri Count LOD2" type="uint" />
+        <field name="Tri Offset LOD2" type="uint" />
+        <field name="Num Combined" type="uint" />
+        <field name="Combined" type="BSPackedGeomDataCombined" arr1="Num Combined" />
+        <field name="Vertex Desc" type="BSVertexDesc" />
+        <field name="Vertex Data" type="BSVertexData" arr1="Num Verts" arg="Vertex Desc #RSH# 44" />
+        <field name="Triangles" type="Triangle" arr1="Tri Count LOD0 + Tri Count LOD1 + Tri Count LOD2" />
     </compound>
 
     <compound name="BSPackedSharedGeomData" versions="#FO4# #F76#">
-        <add name="Num Verts" type="uint" />
-        <add name="LOD Levels" type="uint" />
-        <add name="Tri Count LOD0" type="uint" />
-        <add name="Tri Offset LOD0" type="uint" />
-        <add name="Tri Count LOD1" type="uint" />
-        <add name="Tri Offset LOD1" type="uint" />
-        <add name="Tri Count LOD2" type="uint" />
-        <add name="Tri Offset LOD2" type="uint" />
-        <add name="Num Combined" type="uint" />
-        <add name="Combined" type="BSPackedGeomDataCombined" arr1="Num Combined" />
-        <add name="Vertex Desc" type="BSVertexDesc" />
+        <field name="Num Verts" type="uint" />
+        <field name="LOD Levels" type="uint" />
+        <field name="Tri Count LOD0" type="uint" />
+        <field name="Tri Offset LOD0" type="uint" />
+        <field name="Tri Count LOD1" type="uint" />
+        <field name="Tri Offset LOD1" type="uint" />
+        <field name="Tri Count LOD2" type="uint" />
+        <field name="Tri Offset LOD2" type="uint" />
+        <field name="Num Combined" type="uint" />
+        <field name="Combined" type="BSPackedGeomDataCombined" arr1="Num Combined" />
+        <field name="Vertex Desc" type="BSVertexDesc" />
     </compound>
 
     <compound name="BSPackedGeomObject" size="8" versions="#FO4# #F76#">
         This is the data necessary to access the shared geometry in a PSG/CSG file.
-        <add name="Filename Hash" type="uint">BSCRC32 of the filename without the PSG/CSG extension.</add>
-        <add name="Data Offset" type="uint">Offset of the geometry data in the PSG/CSG file.</add>
+        <field name="Filename Hash" type="uint">BSCRC32 of the filename without the PSG/CSG extension.</field>
+        <field name="Data Offset" type="uint">Offset of the geometry data in the PSG/CSG file.</field>
     </compound>
 
     <niobject name="BSPackedCombinedGeomDataExtra" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Packed Combined Geometry Data.
         Geometry is baked into the file and given a list of transforms to position each copy.
-        <add name="Vertex Desc" type="BSVertexDesc" />
-        <add name="Num Vertices" type="uint" />
-        <add name="Num Triangles" type="uint" />
-        <add name="Unknown Flags 1" type="uint" />
-        <add name="Unknown Flags 2" type="uint" />
-        <add name="Num Data" type="uint" />
-        <add name="Object Data" type="BSPackedGeomData" arr1="Num Data" />
+        <field name="Vertex Desc" type="BSVertexDesc" />
+        <field name="Num Vertices" type="uint" />
+        <field name="Num Triangles" type="uint" />
+        <field name="Unknown Flags 1" type="uint" />
+        <field name="Unknown Flags 2" type="uint" />
+        <field name="Num Data" type="uint" />
+        <field name="Object Data" type="BSPackedGeomData" arr1="Num Data" />
     </niobject>
 
     <niobject name="BSPackedCombinedSharedGeomDataExtra" inherit="NiExtraData" module="BSMain" versions="#FO4# #F76#">
         Fallout 4 Packed Combined Shared Geometry Data.
         Geometry is NOT baked into the file. It is instead a reference to the geometry via a CSG filename hash and data offset.
-        <add name="Vertex Desc" type="BSVertexDesc" />
-        <add name="Num Vertices" type="uint" />
-        <add name="Num Triangles" type="uint" />
-        <add name="Unknown Flags 1" type="uint" />
-        <add name="Unknown Flags 2" type="uint" />
-        <add name="Num Data" type="uint" />
-        <add name="Object" type="BSPackedGeomObject" arr1="Num Data" />
-        <add name="Object Data" type="BSPackedSharedGeomData" arr1="Num Data" />
+        <field name="Vertex Desc" type="BSVertexDesc" />
+        <field name="Num Vertices" type="uint" />
+        <field name="Num Triangles" type="uint" />
+        <field name="Unknown Flags 1" type="uint" />
+        <field name="Unknown Flags 2" type="uint" />
+        <field name="Num Data" type="uint" />
+        <field name="Object" type="BSPackedGeomObject" arr1="Num Data" />
+        <field name="Object Data" type="BSPackedSharedGeomData" arr1="Num Data" />
     </niobject>
 
     <!-- Fallout 4 Animation -->
@@ -8336,38 +8336,38 @@
 	<!-- Skyrim SE --> 
 
 	<niobject name="BSDynamicTriShape" inherit="BSTriShape" module="BSMain" versions="#SSE#">
-		<add name="Dynamic Data Size" type="uint" calc="Num Vertices #MUL# 16" />
-		<add name="Vertices" type="Vector4" arr1="Dynamic Data Size / 16" />
+		<field name="Dynamic Data Size" type="uint" calc="Num Vertices #MUL# 16" />
+		<field name="Vertices" type="Vector4" arr1="Dynamic Data Size / 16" />
 	</niobject>
 	
 	<niobject name="BSDistantObjectLargeRefExtraData" inherit="NiExtraData" module="BSMain" versions="#SSE#">
         Large ref flag.
-		<add name="Large Ref" type="bool" />
+		<field name="Large Ref" type="bool" />
 	</niobject>
 
     <niobject name="BSDistantObjectExtraData" inherit="NiExtraData" module="BSMain" versions="#F76#">
         Distant Object flags.
-        <add name="Distant Object Flags" type="uint" />
+        <field name="Distant Object Flags" type="uint" />
     </niobject>
 
     <compound name="BSDistantObjectInstance" module="BSMain" versions="#F76#">
-        <add name="Unknown Bytes 1" type="byte" arr1="12" />
-        <add name="Num Unknown 1" type="uint" />
-        <add name="Unknown Ints 1" type="uint" arr1="3 #MUL# Num Unknown 1" />
-        <add name="Num Unknown 2" type="uint" />
-        <add name="Unknown Bytes 2" type="byte" binary="true" arr1="64 #MUL# Num Unknown 2" />
+        <field name="Unknown Bytes 1" type="byte" arr1="12" />
+        <field name="Num Unknown 1" type="uint" />
+        <field name="Unknown Ints 1" type="uint" arr1="3 #MUL# Num Unknown 1" />
+        <field name="Num Unknown 2" type="uint" />
+        <field name="Unknown Bytes 2" type="byte" binary="true" arr1="64 #MUL# Num Unknown 2" />
     </compound>
 
     <compound name="BSDistantObjectTextureArray" module="BSMain" versions="#F76#">
-        <add name="Unknown Byte" type="byte" default="1" />
-        <add name="Num Texture Arrays" type="uint" />
-        <add name="Texture Arrays" type="BSTextureArray" arr1="Num Texture Arrays" />
+        <field name="Unknown Byte" type="byte" default="1" />
+        <field name="Num Texture Arrays" type="uint" />
+        <field name="Texture Arrays" type="BSTextureArray" arr1="Num Texture Arrays" />
     </compound>
 
     <niobject name="BSDistantObjectInstancedNode" inherit="BSMultiBoundNode" module="BSMain" versions="#F76#">
-        <add name="Num Instances" type="uint" />
-        <add name="Instances" type="BSDistantObjectInstance" arr1="Num Instances" />
-        <add name="Texture Arrays" type="BSDistantObjectTextureArray" arr1="3" />
+        <field name="Num Instances" type="uint" />
+        <field name="Instances" type="BSDistantObjectInstance" arr1="Num Instances" />
+        <field name="Texture Arrays" type="BSDistantObjectTextureArray" arr1="3" />
     </niobject>
 
 </niftoolsxml>