Merge branch 'shader-refactor'

DataSpec/DNAMP1/ScriptObjects/AIJumpPoint.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_AIJUMPPOINT_HPP_
-#define _DNAMP1_AIJUMPPOINT_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -19,4 +18,3 @@ struct AIJumpPoint : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/AIKeyframe.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_AIKEYFRAME_HPP_
-#define _DNAMP1_AIKEYFRAME_HPP_
+#pragma once
 
 #include "IScriptObject.hpp"
 #include "Parameters.hpp"
@@ -21,4 +20,3 @@ struct AIKeyframe : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Actor.cpp

@@ -21,7 +21,7 @@ zeus::CAABox Actor::getVISIAABB(hecl::blender::Token& btok) const
     {
         hecl::ProjectPath path = UniqueIDBridge::TranslatePakIdToPath(
             animationParameters.animationCharacterSet);
-        conn.openBlend(path.getWithExtension(_S(".blend"), true));
+        conn.openBlend(path.getWithExtension(_SYS_STR(".blend"), true));
         hecl::blender::DataStream ds = conn.beginData();
         auto aabb = ds.getMeshAABB();
         aabbOut = zeus::CAABox(aabb.first, aabb.second);

DataSpec/DNAMP1/ScriptObjects/Actor.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ACTOR_HPP_
-#define _DNAMP1_ACTOR_HPP_
+#pragma once
 
 #include "IScriptObject.hpp"
 #include "Parameters.hpp"
@@ -35,10 +34,9 @@ struct Actor : IScriptObject
     Value<bool>     scaleAdvancementDelta;
     Value<bool>     materialFlag54;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -69,4 +67,3 @@ struct Actor : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ACTORCONTRAPTION_HPP_
-#define _DNAMP1_ACTORCONTRAPTION_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -27,10 +26,9 @@ struct ActorContraption : IScriptObject
     DamageInfo          damageInfo;
     Value<bool>         active; // needs verification
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -59,4 +57,3 @@ struct ActorContraption : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/ActorKeyframe.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ACTORKEYFRAME_HPP_
-#define _DNAMP1_ACTORKEYFRAME_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -21,4 +20,3 @@ struct ActorKeyframe : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/ActorRotate.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ACTORROTATE_HPP_
-#define _DNAMP1_ACTORROTATE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -20,4 +19,3 @@ struct ActorRotate : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_AMBIENTAI_HPP_
-#define _DNAMP1_AMBIENTAI_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -28,10 +27,9 @@ struct AmbientAI : IScriptObject
     Value<atInt32>      impactAnim;
     Value<bool>         active;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -54,4 +52,3 @@ struct AmbientAI : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_AREAATTRIBUTES_HPP_
-#define _DNAMP1_AREAATTRIBUTES_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -36,4 +35,3 @@ struct AreaAttributes : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ATOMICALPHA_HPP_
-#define _DNAMP1_ATOMICALPHA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -26,10 +25,9 @@ struct AtomicAlpha : IScriptObject
     Value<bool>  unknown4;
     Value<bool>  unknown5;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -64,4 +62,3 @@ struct AtomicAlpha : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ATOMICBETA_HPP_
-#define _DNAMP1_ATOMICBETA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -33,10 +32,9 @@ struct AtomicBeta : IScriptObject
     Value<atUint32> unknown9;
     Value<float> unknown10;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -77,4 +75,3 @@ struct AtomicBeta : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_Babygoth_HPP_
-#define _DNAMP1_Babygoth_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -27,8 +26,8 @@ struct Babygoth : IScriptObject
     DamageInfo damageInfo3;
     DamageVulnerability damageVulnerabilty1;
     DamageVulnerability damageVulnerabilty2;
-    UniqueID32 model;
-    UniqueID32 skin;
+    UniqueID32 cmdlShelless;
+    UniqueID32 cskrShelless;
     Value<float> unknown3;
     Value<atUint32> unknown4;
     UniqueID32 particle2;
@@ -45,13 +44,19 @@ struct Babygoth : IScriptObject
     Value<atUint32> unknown11;
     UniqueID32 particle6;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
         UniqueID32 cinf = patternedInfo.animationParameters.getCINF(pakRouter);
-        actorParameters.addCMDLRigPairs(addTo, cinf);
-        if (model && skin)
-            addTo[model] = std::make_pair(skin, cinf);
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
+
+        if (cmdlShelless && cskrShelless)
+        {
+            charAssoc.m_cmdlRigs[cmdlShelless] = std::make_pair(cskrShelless, cinf);
+            charAssoc.m_cskrCinfToCharacter[cskrShelless] = std::make_pair(
+                patternedInfo.animationParameters.animationCharacterSet, "ATTACH.SHELLESS.CSKR");
+            charAssoc.addAttachmentRig(patternedInfo.animationParameters.animationCharacterSet,
+                                       {}, cmdlShelless, "SHELLESS");
+        }
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -71,14 +76,14 @@ struct Babygoth : IScriptObject
             PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
             ent->name = name + "_part1";
         }
-        if (model)
+        if (cmdlShelless)
         {
-            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
+            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cmdlShelless);
             ent->name = name + "_emodel";
         }
-        if (skin)
+        if (cskrShelless)
         {
-            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(skin);
+            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cskrShelless);
             ent->name = name + "_eskin";
         }
         if (particle2)
@@ -121,8 +126,8 @@ struct Babygoth : IScriptObject
         g_curSpec->flattenDependencies(wpsc1, pathsOut);
         g_curSpec->flattenDependencies(wpsc2, pathsOut);
         g_curSpec->flattenDependencies(particle1, pathsOut);
-        g_curSpec->flattenDependencies(model, pathsOut);
-        g_curSpec->flattenDependencies(skin, pathsOut);
+        g_curSpec->flattenDependencies(cmdlShelless, pathsOut);
+        g_curSpec->flattenDependencies(cskrShelless, pathsOut);
         g_curSpec->flattenDependencies(particle2, pathsOut);
         g_curSpec->flattenDependencies(particle3, pathsOut);
         g_curSpec->flattenDependencies(particle4, pathsOut);
@@ -140,4 +145,3 @@ struct Babygoth : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/BallTrigger.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_BALLTRIGGER_HPP_
-#define _DNAMP1_BALLTRIGGER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -23,4 +22,3 @@ struct BallTrigger : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Beetle.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_BEETLE_HPP_
-#define _DNAMP1_BEETLE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -28,10 +27,9 @@ struct Beetle : IScriptObject
     Value<float> unknown5;
     Value<float> unknown6;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -60,4 +58,3 @@ struct Beetle : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_BLOODFLOWER_HPP_
-#define _DNAMP1_BLOODFLOWER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -30,10 +29,9 @@ struct BloodFlower : IScriptObject
     UniqueID32 particle5;
     Value<atUint32> unknown2;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -98,4 +96,3 @@ struct BloodFlower : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Burrower.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_BURROWER_HPP_
-#define _DNAMP1_BURROWER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -25,10 +24,9 @@ struct Burrower : IScriptObject
     Value<atUint32> unknown; // always FF
     UniqueID32 particle4;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -81,4 +79,3 @@ struct Burrower : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Camera.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_CAMERA_HPP_
-#define _DNAMP1_CAMERA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -29,4 +28,3 @@ struct Camera : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/CameraBlurKeyframe.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_CAMERABLURKEYFRAME_HPP_
-#define _DNAMP1_CAMERABLURKEYFRAME_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -21,4 +20,3 @@ struct CameraBlurKeyframe : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_CAMERAFILTERKEYFRAME_HPP_
-#define _DNAMP1_CAMERAFILTERKEYFRAME_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -39,4 +38,3 @@ struct CameraFilterKeyframe : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/CameraHint.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_CAMERAHINT_HPP_
-#define _DNAMP1_CAMERAHINT_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -68,4 +67,3 @@ struct CameraHint : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/CameraHintTrigger.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_CAMERAHINTRIGGER_HPP_
-#define _DNAMP1_CAMERAHINTRIGGER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -21,4 +20,3 @@ struct CameraHintTrigger : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/CameraPitchVolume.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_CAMERAPITCHVOLUME_HPP_
-#define _DNAMP1_CAMERAPITCHVOLUME_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -22,4 +21,3 @@ struct CameraPitchVolume : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/CameraShaker.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_CAMERASHAKER_HPP_
-#define _DNAMP1_CAMERASHAKER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -23,4 +22,3 @@ struct CameraShaker : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/CameraWaypoint.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_CAMERAWAYPOINT_HPP_
-#define _DNAMP1_CAMERAWAYPOINT_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -20,4 +19,3 @@ struct CameraWaypoint : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_CHOZOGHOST_HPP_
-#define _DNAMP1_CHOZOGHOST_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -43,10 +42,9 @@ struct ChozoGhost : IScriptObject
     Value<atUint32> unknown12;
     Value<atUint32> unknown13;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -87,4 +85,3 @@ struct ChozoGhost : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/ColorModulate.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_COLORMODULATE_HPP_
-#define _DNAMP1_COLORMODULATE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -26,4 +25,3 @@ struct ColorModulate : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/ControllerAction.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_CONTROLLERACTION_HPP_
-#define _DNAMP1_CONTROLLERACTION_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -18,4 +17,3 @@ struct ControllerAction : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Counter.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_COUNTER_HPP_
-#define _DNAMP1_COUNTER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -19,4 +18,3 @@ struct Counter : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/CoverPoint.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_COVERPOINT_HPP_
-#define _DNAMP1_COVERPOINT_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -23,4 +22,3 @@ struct CoverPoint : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_DAMAGABLETRIGGER_HPP_
-#define _DNAMP1_DAMAGABLETRIGGER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -60,4 +59,3 @@ struct DamageableTrigger : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Debris.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_DEBRIS_HPP_
-#define _DNAMP1_DEBRIS_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -60,4 +59,3 @@ struct Debris : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_DEBRISEXTENDED_HPP_
-#define _DNAMP1_DEBRISEXTENDED_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -93,4 +92,3 @@ struct DebrisExtended : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/DebugCameraWaypoint.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_DEBUGCAMERAWAYPOINT_HPP_
-#define _DNAMP1_DEBUGCAMERAWAYPOINT_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -18,4 +17,3 @@ struct DebugCameraWaypoint : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/DistanceFog.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_DISTANCEFOG_HPP_
-#define _DNAMP1_DISTANCEFOG_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -22,4 +21,3 @@ struct DistanceFog : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Dock.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_DOCK_HPP_
-#define _DNAMP1_DOCK_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -21,4 +20,3 @@ struct Dock : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/DockAreaChange.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_DOCKAREACHANGE_HPP_
-#define _DNAMP1_DOCKAREACHANGE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -17,4 +16,3 @@ struct DockAreaChange : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/DoorArea.cpp

@@ -13,7 +13,7 @@ zeus::CAABox DoorArea::getVISIAABB(hecl::blender::Token& btok) const
     {
         hecl::ProjectPath path = UniqueIDBridge::TranslatePakIdToPath(
             animationParameters.animationCharacterSet);
-        conn.openBlend(path.getWithExtension(_S(".blend"), true));
+        conn.openBlend(path.getWithExtension(_SYS_STR(".blend"), true));
         hecl::blender::DataStream ds = conn.beginData();
         auto aabb = ds.getMeshAABB();
         aabbOut = zeus::CAABox(aabb.first, aabb.second);

DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_DOORAREA_HPP_
-#define _DNAMP1_DOORAREA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -26,10 +25,9 @@ struct DoorArea : IScriptObject
     Value<float> animationLength;
     Value<bool> isMorphballDoor;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -54,4 +52,3 @@ struct DoorArea : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Drone.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_DRONE_HPP_
-#define _DNAMP1_DRONE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -57,10 +56,9 @@ struct Drone : IScriptObject
     Value<atUint32> sound; // verification needed
     Value<bool> unknown30;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -99,4 +97,3 @@ struct Drone : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Effect.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_EFFECT_HPP_
-#define _DNAMP1_EFFECT_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -59,4 +58,3 @@ struct Effect : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ELECTROMAGNETICPULSE_HPP_
-#define _DNAMP1_ELECTROMAGNETICPULSE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -41,4 +40,3 @@ struct ElectroMagneticPulse : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ELITEPIRATE_HPP_
-#define _DNAMP1_ELITEPIRATE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -54,11 +53,10 @@ struct ElitePirate : IScriptObject
     Value<bool> unknown17;
     Value<bool> unknown18;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters1.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
-        actorParameters2.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
+        actorParameters1.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
+        actorParameters2.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -140,4 +138,3 @@ struct ElitePirate : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ENERGYBALL_HPP_
-#define _DNAMP1_ENERGYBALL_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -32,10 +31,9 @@ struct EnergyBall : IScriptObject
     DamageInfo damageInfo2;
     Value<float> unknown6;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -82,4 +80,3 @@ struct EnergyBall : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/EnvFxDensityController.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ENVFXDENSITYCONTROLLER_HPP_
-#define _DNAMP1_ENVFXDENSITYCONTROLLER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -18,4 +17,3 @@ struct EnvFxDensityController : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_EYEBALL_HPP_
-#define _DNAMP1_EYEBALL_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -33,10 +32,9 @@ struct Eyeball : IScriptObject
     Value<atUint32> unknown8;
     Value<bool> unknown9;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -89,4 +87,3 @@ struct Eyeball : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_FIREFLEA_HPP_
-#define _DNAMP1_FIREFLEA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -21,10 +20,9 @@ struct FireFlea : IScriptObject
     Value<bool> unknown2;
     Value<float> unknown3;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -47,4 +45,3 @@ struct FireFlea : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_FISHCLOUD_HPP_
-#define _DNAMP1_FISHCLOUD_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -91,4 +90,3 @@ struct FishCloud : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/FishCloudModifier.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_FISHCLOUDMODIFIER_HPP_
-#define _DNAMP1_FISHCLOUDMODIFIER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -21,4 +20,3 @@ struct FishCloudModifier : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_FLAAHGRA_HPP_
-#define _DNAMP1_FLAAHGRA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -35,11 +34,10 @@ struct Flaahgra : IScriptObject
     AnimationParameters animationParameters;
     UniqueID32 dependencyGroup;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-                         std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters1.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
-        actorParameters2.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
+        actorParameters1.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
+        actorParameters2.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -91,4 +89,3 @@ struct Flaahgra : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_FLAAHGRATENTACLE_HPP_
-#define _DNAMP1_FLAAHGRATENTACLE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -18,10 +17,9 @@ struct FlaahgraTentacle : IScriptObject
     PatternedInfo patternedInfo;
     ActorParameters actorParameters;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -44,4 +42,3 @@ struct FlaahgraTentacle : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_FLICKERBAT_HPP_
-#define _DNAMP1_FLICKERBAT_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -22,10 +21,9 @@ struct FlickerBat : IScriptObject
     Value<bool> unknown3;
     Value<bool> unknown4;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -48,4 +46,3 @@ struct FlickerBat : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_FLYINGPIRATE_HPP_
-#define _DNAMP1_FLYINGPIRATE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -48,10 +47,9 @@ struct FlyingPirate : IScriptObject
     Value<float> unknown19;
     Value<float> unknown20;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -116,4 +114,3 @@ struct FlyingPirate : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/FogVolume.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_FOGVOLUME_HPP_
-#define _DNAMP1_FOGVOLUME_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -21,4 +20,3 @@ struct FogVolume : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Geemer.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_GEEMER_HPP_
-#define _DNAMP1_GEEMER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -28,10 +27,9 @@ struct Geemer : IScriptObject
     Value<atUint32> unknown9;
     Value<atUint32> unknown10;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -54,4 +52,3 @@ struct Geemer : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Generator.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_GENERATOR_HPP_
-#define _DNAMP1_GENERATOR_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -22,4 +21,3 @@ struct Generator : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/GrapplePoint.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_GRAPPLEPOINT_HPP_
-#define _DNAMP1_GRAPPLEPOINT_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -19,4 +18,3 @@ struct GrapplePoint : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_GUNTURRET_HPP_
-#define _DNAMP1_GUNTURRET_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -60,10 +59,9 @@ struct GunTurret : IScriptObject
     Value<float> unknown29;
     Value<bool> unknown30;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -140,4 +138,3 @@ struct GunTurret : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_HUDMEMO_HPP_
-#define _DNAMP1_HUDMEMO_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -35,4 +34,3 @@ struct HUDMemo : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp

@@ -1,5 +1,4 @@
-#ifndef __DNAMP1_SCRIPTOBJECT_HPP
-#define __DNAMP1_SCRIPTOBJECT_HPP
+#pragma once
 #include "../../DNACommon/DNACommon.hpp"
 #include "../DNAMP1.hpp"
 #include "../SAVW.hpp"
@@ -42,7 +41,7 @@ struct IScriptObject : BigDNAVYaml
     virtual ~IScriptObject() = default;
 
     virtual void addCMDLRigPairs(PAKRouter<PAKBridge>&,
-                                 std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>&) const {}
+                                 CharacterAssociations<UniqueID32>& charAssoc) const {}
     virtual void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {}
     virtual void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
                                     std::vector<hecl::ProjectPath>& lazyOut) const {}
@@ -51,4 +50,3 @@ struct IScriptObject : BigDNAVYaml
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ICESHEEGOTH_HPP_
-#define _DNAMP1_ICESHEEGOTH_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -49,10 +48,9 @@ struct IceSheegoth : IScriptObject
     Value<bool> unknown12;
     Value<bool> unknown13;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -135,4 +133,3 @@ struct IceSheegoth : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ICEZOOMER_HPP_
-#define _DNAMP1_ICEZOOMER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -28,10 +27,9 @@ struct IceZoomer : IScriptObject
     DamageVulnerability damageVulnerabilty;
     Value<float> unknown9;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -54,4 +52,3 @@ struct IceZoomer : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_JELLYZAP_HPP_
-#define _DNAMP1_JELLYZAP_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -32,10 +31,9 @@ struct JellyZap : IScriptObject
     Value<float> unknown12;
     Value<bool> unknown13;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -58,4 +56,3 @@ struct JellyZap : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_MAGDOLITE_HPP_
-#define _DNAMP1_MAGDOLITE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -23,8 +22,8 @@ struct Magdolite : IScriptObject
     DamageInfo damageInfo2;
     DamageVulnerability damageVulnerabilty1;
     DamageVulnerability damageVulnerabilty2;
-    UniqueID32 model;
-    UniqueID32 skin;
+    UniqueID32 cmdlHeadless;
+    UniqueID32 cskrHeadless;
     Value<float> unknown3;
     Value<float> unknown4;
     Value<float> unknown5;
@@ -44,25 +43,31 @@ struct Magdolite : IScriptObject
     Value<float> unknown8;
     Value<float> unknown9;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
         UniqueID32 cinf = patternedInfo.animationParameters.getCINF(pakRouter);
-        actorParameters.addCMDLRigPairs(addTo, cinf);
-        if (model && skin)
-            addTo[model] = std::make_pair(skin, cinf);
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
+
+        if (cmdlHeadless && cskrHeadless)
+        {
+            charAssoc.m_cmdlRigs[cmdlHeadless] = std::make_pair(cskrHeadless, cinf);
+            charAssoc.m_cskrCinfToCharacter[cskrHeadless] = std::make_pair(
+                patternedInfo.animationParameters.animationCharacterSet, "ATTACH.HEADLESS.CSKR");
+            charAssoc.addAttachmentRig(patternedInfo.animationParameters.animationCharacterSet,
+                                       {}, cmdlHeadless, "HEADLESS");
+        }
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
     {
-        if (model)
+        if (cmdlHeadless)
         {
-            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
+            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cmdlHeadless);
             ent->name = name + "_emodel";
         }
-        if (skin)
+        if (cskrHeadless)
         {
-            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(skin);
+            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cskrHeadless);
             ent->name = name + "_eskin";
         }
         if (magdoliteParameters.particle)
@@ -77,8 +82,8 @@ struct Magdolite : IScriptObject
     void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
                             std::vector<hecl::ProjectPath>& lazyOut) const
     {
-        g_curSpec->flattenDependencies(model, pathsOut);
-        g_curSpec->flattenDependencies(skin, pathsOut);
+        g_curSpec->flattenDependencies(cmdlHeadless, pathsOut);
+        g_curSpec->flattenDependencies(cskrHeadless, pathsOut);
         g_curSpec->flattenDependencies(magdoliteParameters.particle, pathsOut);
         patternedInfo.depIDs(pathsOut);
         actorParameters.depIDs(pathsOut, lazyOut);
@@ -91,4 +96,3 @@ struct Magdolite : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/MazeNode.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_MAZENODE_HPP_
-#define _DNAMP1_MAZENODE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -24,4 +23,3 @@ struct MazeNode : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/MemoryRelay.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_MEMORYRELAY_HPP_
-#define _DNAMP1_MEMORYRELAY_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -17,4 +16,3 @@ struct MemoryRelay : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_METAREEALPHA_HPP_
-#define _DNAMP1_METAREEALPHA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -24,10 +23,9 @@ struct MetareeAlpha : IScriptObject
     Value<float> unknown4;
     Value<float> unknown5;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -50,4 +48,3 @@ struct MetareeAlpha : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_METROIDALPHA_HPP_
-#define _DNAMP1_METROIDALPHA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -32,10 +31,9 @@ struct MetroidAlpha : IScriptObject
     AnimationParameters animationParameters4;
     Value<bool> unknown8;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -66,4 +64,3 @@ struct MetroidAlpha : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_METROIDBETA_HPP_
-#define _DNAMP1_METROIDBETA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -35,10 +34,9 @@ struct MetroidBeta : IScriptObject
     UniqueID32 particle4;
     Value<bool> unknown10;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -91,4 +89,3 @@ struct MetroidBeta : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_METROIDPRIMESTAGE1_HPP_
-#define _DNAMP1_METROIDPRIMESTAGE1_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -329,11 +328,10 @@ struct MetroidPrimeStage1 : IScriptObject
         }
     } massivePrimeStruct;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        massivePrimeStruct.actorParameters.addCMDLRigPairs(addTo,
-        massivePrimeStruct.patternedInfo.animationParameters.getCINF(pakRouter));
+        massivePrimeStruct.actorParameters.addCMDLRigPairs(pakRouter, charAssoc,
+        massivePrimeStruct.patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -354,4 +352,3 @@ struct MetroidPrimeStage1 : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_METROIDPRIMESTAGE2_HPP_
-#define _DNAMP1_METROIDPRIMESTAGE2_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -23,10 +22,9 @@ struct MetroidPrimeStage2 : IScriptObject
     Value<atUint32> unknown;
     UniqueID32 particle2;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -67,4 +65,3 @@ struct MetroidPrimeStage2 : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Midi.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_MIDI_HPP_
-#define _DNAMP1_MIDI_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -36,4 +35,3 @@ struct Midi : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/NewCameraShaker.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_NEWCAMERASHAKER_HPP_
-#define _DNAMP1_NEWCAMERASHAKER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -36,4 +35,3 @@ struct NewCameraShaker : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_NEWINTROBOSS_HPP_
-#define _DNAMP1_NEWINTROBOSS_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -25,10 +24,9 @@ struct NewIntroBoss : IScriptObject
     UniqueID32 texture1;
     UniqueID32 texture2;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -75,4 +73,3 @@ struct NewIntroBoss : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Oculus.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_OCULUS_HPP_
-#define _DNAMP1_OCULUS_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -30,10 +29,9 @@ struct Oculus : IScriptObject
     /* Trilogy addition */
     Value<float> unknown8;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -57,4 +55,3 @@ struct Oculus : IScriptObject
 
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_OMEGAPIRATE_HPP_
-#define _DNAMP1_OMEGAPIRATE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -53,17 +52,25 @@ struct OmegaPirate : IScriptObject
     Value<atUint32> soundID5;
     Value<bool> unknown17;
     Value<bool> unknown18;
-    UniqueID32 model2;
-    UniqueID32 skin;
-    UniqueID32 rig;
+    UniqueID32 cmdlPhazonVeins;
+    UniqueID32 cskrPhazonVeins;
+    UniqueID32 cinfPhazonVeins;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters1.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
-        actorParameters2.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
-        if (model2 && skin && rig)
-            addTo[model2] = std::make_pair(skin, rig);
+        actorParameters1.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
+        actorParameters2.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
+        if (cmdlPhazonVeins && cskrPhazonVeins && cinfPhazonVeins)
+        {
+            charAssoc.m_cmdlRigs[cmdlPhazonVeins] = std::make_pair(cskrPhazonVeins, cinfPhazonVeins);
+            charAssoc.m_cskrCinfToCharacter[cskrPhazonVeins] = std::make_pair(
+                patternedInfo.animationParameters.animationCharacterSet, "ATTACH.VEINS.CSKR");
+            charAssoc.m_cskrCinfToCharacter[cinfPhazonVeins] = std::make_pair(
+                patternedInfo.animationParameters.animationCharacterSet,
+                hecl::Format("CINF_%08X.CINF", cinfPhazonVeins.toUint32()));
+            charAssoc.addAttachmentRig(patternedInfo.animationParameters.animationCharacterSet,
+                                       cinfPhazonVeins, cmdlPhazonVeins, "VEINS");
+        }
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -113,19 +120,19 @@ struct OmegaPirate : IScriptObject
             PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model1);
             ent->name = name + "_model1";
         }
-        if (model2)
+        if (cmdlPhazonVeins)
         {
-            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model2);
+            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cmdlPhazonVeins);
             ent->name = name + "_model2";
         }
-        if (skin)
+        if (cskrPhazonVeins)
         {
-            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(skin);
+            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cskrPhazonVeins);
             ent->name = name + "_skin";
         }
-        if (rig)
+        if (cinfPhazonVeins)
         {
-            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(rig);
+            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cinfPhazonVeins);
             ent->name = name + "_rig";
         }
         patternedInfo.nameIDs(pakRouter, name + "_patterned");
@@ -146,9 +153,9 @@ struct OmegaPirate : IScriptObject
         g_curSpec->flattenDependencies(particle7, pathsOut);
         g_curSpec->flattenDependencies(elsc, pathsOut);
         g_curSpec->flattenDependencies(model1, pathsOut);
-        g_curSpec->flattenDependencies(model2, pathsOut);
-        g_curSpec->flattenDependencies(skin, pathsOut);
-        g_curSpec->flattenDependencies(rig, pathsOut);
+        g_curSpec->flattenDependencies(cmdlPhazonVeins, pathsOut);
+        g_curSpec->flattenDependencies(cskrPhazonVeins, pathsOut);
+        g_curSpec->flattenDependencies(cinfPhazonVeins, pathsOut);
         patternedInfo.depIDs(pathsOut);
         actorParameters1.depIDs(pathsOut, lazyOut);
         actorParameters2.depIDs(pathsOut, lazyOut);
@@ -163,4 +170,3 @@ struct OmegaPirate : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Parameters.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PARAMETERS_HPP_
-#define _DNAMP1_PARAMETERS_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "../DNAMP1.hpp"
@@ -403,10 +402,10 @@ struct ActorParameters : BigDNA
     Value<atUint32> propertyCount;
     LightParameters lightParameters;
     ScannableParameters scannableParameters;
-    UniqueID32   xrayModel;
-    UniqueID32   xraySkin;
-    UniqueID32   thermalModel;
-    UniqueID32   thermalSkin;
+    UniqueID32   cmdlXray;
+    UniqueID32   cskrXray;
+    UniqueID32   cmdlThermal;
+    UniqueID32   cskrThermal;
     Value<bool>  globalTimeProvider;
     Value<float> fadeInTime;
     Value<float> fadeOutTime;
@@ -416,36 +415,47 @@ struct ActorParameters : BigDNA
     Value<bool>  noSortThermal;
     Value<float> thermalMag;
 
-    void addCMDLRigPairs(std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo,
-                         const UniqueID32& cinf) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc,
+                         const AnimationParameters& animParms) const
     {
-        if (xrayModel && xraySkin)
-            addTo[xrayModel] = std::make_pair(xraySkin, cinf);
-        if (thermalModel && thermalSkin)
-            addTo[thermalModel] = std::make_pair(thermalSkin, cinf);
+        auto cinf = animParms.getCINF(pakRouter);
+        if (cmdlXray && cskrXray)
+        {
+            charAssoc.m_cmdlRigs[cmdlXray] = std::make_pair(cskrXray, cinf);
+            charAssoc.m_cskrCinfToCharacter[cskrXray] = std::make_pair(
+                animParms.animationCharacterSet, "ATTACH.XRAY.CSKR");
+            charAssoc.addAttachmentRig(animParms.animationCharacterSet, {}, cmdlXray, "XRAY");
+        }
+        if (cmdlThermal && cskrThermal)
+        {
+            charAssoc.m_cmdlRigs[cmdlThermal] = std::make_pair(cskrThermal, cinf);
+            charAssoc.m_cskrCinfToCharacter[cskrThermal] = std::make_pair(
+                animParms.animationCharacterSet, "ATTACH.THERMAL.CSKR");
+            charAssoc.addAttachmentRig(animParms.animationCharacterSet, {}, cmdlThermal, "THERMAL");
+        }
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const
     {
         scannableParameters.nameIDs(pakRouter, name);
-        if (xrayModel)
+        if (cmdlXray)
         {
-            PAK::Entry* xmEnt = (PAK::Entry*)pakRouter.lookupEntry(xrayModel);
+            PAK::Entry* xmEnt = (PAK::Entry*)pakRouter.lookupEntry(cmdlXray);
             xmEnt->name = name + "_xraymodel";
         }
-        if (xraySkin)
+        if (cskrXray)
         {
-            PAK::Entry* xsEnt = (PAK::Entry*)pakRouter.lookupEntry(xraySkin);
+            PAK::Entry* xsEnt = (PAK::Entry*)pakRouter.lookupEntry(cskrXray);
             xsEnt->name = name + "_xrayskin";
         }
-        if (thermalModel)
+        if (cmdlThermal)
         {
-            PAK::Entry* xmEnt = (PAK::Entry*)pakRouter.lookupEntry(thermalModel);
+            PAK::Entry* xmEnt = (PAK::Entry*)pakRouter.lookupEntry(cmdlThermal);
             xmEnt->name = name + "_thermalmodel";
         }
-        if (thermalSkin)
+        if (cskrThermal)
         {
-            PAK::Entry* xsEnt = (PAK::Entry*)pakRouter.lookupEntry(thermalSkin);
+            PAK::Entry* xsEnt = (PAK::Entry*)pakRouter.lookupEntry(cskrThermal);
             xsEnt->name = name + "_thermalskin";
         }
     }
@@ -454,10 +464,10 @@ struct ActorParameters : BigDNA
                 std::vector<hecl::ProjectPath>& lazyOut) const
     {
         scannableParameters.depIDs(lazyOut);
-        g_curSpec->flattenDependencies(xrayModel, pathsOut);
-        g_curSpec->flattenDependencies(xraySkin, pathsOut);
-        g_curSpec->flattenDependencies(thermalModel, pathsOut);
-        g_curSpec->flattenDependencies(thermalSkin, pathsOut);
+        g_curSpec->flattenDependencies(cmdlXray, pathsOut);
+        g_curSpec->flattenDependencies(cskrXray, pathsOut);
+        g_curSpec->flattenDependencies(cmdlThermal, pathsOut);
+        g_curSpec->flattenDependencies(cskrThermal, pathsOut);
     }
 
     void scanIDs(std::vector<Scan>& scansOut) const
@@ -522,4 +532,3 @@ struct BeamInfo : BigDNA
 
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Parasite.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PARASITE_HPP_
-#define _DNAMP1_PARASITE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -37,10 +36,9 @@ struct Parasite : IScriptObject
     Value<float> unknown18;
     Value<bool> unknown19;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -63,4 +61,3 @@ struct Parasite : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/PathCamera.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PATHCAMERA_HPP_
-#define _DNAMP1_PATHCAMERA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -36,4 +35,3 @@ struct PathCamera : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PHAZONHEALINGNODULE_HPP_
-#define _DNAMP1_PHAZONHEALINGNODULE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -21,10 +20,9 @@ struct PhazonHealingNodule : IScriptObject
     UniqueID32 elsc;
     String<-1> unknown2;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -53,4 +51,3 @@ struct PhazonHealingNodule : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PHAZONPOOL_HPP_
-#define _DNAMP1_PHAZONPOOL_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -65,4 +64,3 @@ struct PhazonPool : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Pickup.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PICKUP_HPP_
-#define _DNAMP1_PICKUP_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -30,10 +29,9 @@ struct Pickup : IScriptObject
     Value<float> unknown1;
     UniqueID32 particle;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -68,4 +66,3 @@ struct Pickup : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/PickupGenerator.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PICKUPGENERATOR_HPP_
-#define _DNAMP1_PICKUPGENERATOR_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -18,4 +17,3 @@ struct PickupGenerator : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Platform.cpp

@@ -21,7 +21,7 @@ zeus::CAABox Platform::getVISIAABB(hecl::blender::Token& btok) const
     {
         hecl::ProjectPath path = UniqueIDBridge::TranslatePakIdToPath(
             animationParameters.animationCharacterSet);
-        conn.openBlend(path.getWithExtension(_S(".blend"), true));
+        conn.openBlend(path.getWithExtension(_SYS_STR(".blend"), true));
         hecl::blender::DataStream ds = conn.beginData();
         auto aabb = ds.getMeshAABB();
         aabbOut = zeus::CAABox(aabb.first, aabb.second);

DataSpec/DNAMP1/ScriptObjects/Platform.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PLATFORM_HPP_
-#define _DNAMP1_PLATFORM_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -31,10 +30,9 @@ struct Platform : IScriptObject
     Value<atUint32> maxRainSplashes;
     Value<atUint32> rainGenRate;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -71,4 +69,3 @@ struct Platform : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PLAYERACTOR_HPP_
-#define _DNAMP1_PLAYERACTOR_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -31,10 +30,9 @@ struct PlayerActor : IScriptObject
     PlayerParameters playerParameters;
     Value<atUint32> beamId;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -64,4 +62,3 @@ struct PlayerActor : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/PlayerHint.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PLAYERHINT_HPP_
-#define _DNAMP1_PLAYERHINT_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -20,4 +19,3 @@ struct PlayerHint : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/PlayerStateChange.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PLAYERSTATECHANGE_HPP_
-#define _DNAMP1_PLAYERSTATECHANGE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -21,4 +20,3 @@ struct PlayerStateChange : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_POINTOFINTEREST_HPP_
-#define _DNAMP1_POINTOFINTEREST_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -36,4 +35,3 @@ struct PointOfInterest : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PUDDLESPORE_HPP_
-#define _DNAMP1_PUDDLESPORE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -28,10 +27,9 @@ struct PuddleSpore : IScriptObject
     UniqueID32 wpsc;
     DamageInfo damageInfo;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -66,4 +64,3 @@ struct PuddleSpore : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PUDDLETOADGAMMA_HPP_
-#define _DNAMP1_PUDDLETOADGAMMA_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -29,10 +28,9 @@ struct PuddleToadGamma : IScriptObject
     DamageInfo damageInfo2;
     UniqueID32 dcln;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -61,4 +59,3 @@ struct PuddleToadGamma : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Puffer.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_PUFFER_HPP_
-#define _DNAMP1_PUFFER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -28,10 +27,9 @@ struct Puffer : IScriptObject
     DamageInfo damageInfo2;
     Value<atUint32> unknown6;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -66,4 +64,3 @@ struct Puffer : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/RadialDamage.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_RADIALDAMAGE_HPP_
-#define _DNAMP1_RADIALDAMAGE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -19,4 +18,3 @@ struct RadialDamage : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/RandomRelay.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_RANDOMRELAY_HPP_
-#define _DNAMP1_RANDOMRELAY_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -19,4 +18,3 @@ struct RandomRelay : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Relay.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_RELAY_HPP_
-#define _DNAMP1_RELAY_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -16,4 +15,3 @@ struct Relay : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Repulsor.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_REPULSOR_HPP_
-#define _DNAMP1_REPULSOR_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -18,4 +17,3 @@ struct Repulsor : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Ridley.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_RIDLEY_HPP_
-#define _DNAMP1_RIDLEY_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -131,10 +130,9 @@ struct Ridley : IScriptObject
     /* Trilogy addition */
     DamageInfo damageInfo9;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -267,4 +265,3 @@ struct Ridley : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Ripper.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_RIPPER_HPP_
-#define _DNAMP1_RIPPER_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -20,10 +19,9 @@ struct Ripper : IScriptObject
     ActorParameters actorParameters;
     GrappleParameters grappleParameters;
 
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
     {
-        actorParameters.addCMDLRigPairs(addTo, patternedInfo.animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
     }
 
     void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
@@ -46,4 +44,3 @@ struct Ripper : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/Ripple.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_RIPPLE_HPP_
-#define _DNAMP1_RIPPLE_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -18,4 +17,3 @@ struct Ripple : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/RoomAcoustics.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_ROOMACOUSTICS_HPP_
-#define _DNAMP1_ROOMACOUSTICS_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -40,4 +39,3 @@ struct RoomAcoustics : IScriptObject
 };
 }
 
-#endif

DataSpec/DNAMP1/ScriptObjects/RumbleEffect.hpp

@@ -1,5 +1,4 @@
-#ifndef _DNAMP1_RUMBLEEFFECT_HPP_
-#define _DNAMP1_RUMBLEEFFECT_HPP_
+#pragma once
 
 #include "../../DNACommon/DNACommon.hpp"
 #include "IScriptObject.hpp"
@@ -26,4 +25,3 @@ struct RumbleEffect : IScriptObject
 };
 }
 
-#endif