Shader refactor bug fixes and attachment model extract/cook

2025-12-08 15:44:56 +00:00 · 2018-10-11 10:50:05 -10:00
parent c91e5df986
commit 1559163f98
85 changed files with 535 additions and 382 deletions
--- a/DataSpec/DNAMP1/ANCS.cpp
+++ b/DataSpec/DNAMP1/ANCS.cpp
@@ -399,8 +399,8 @@ void ANCS::CharacterSet::CharacterInfo::Enumerate<BigDNA::Read>(athena::io::IStr

    if (sectionCount > 3)
    {
-        cmdlOverlay.read(reader);
-        cskrOverlay.read(reader);
+        cmdlIce.read(reader);
+        cskrIce.read(reader);
    }

    animIdxs.clear();
@@ -421,7 +421,7 @@ void ANCS::CharacterSet::CharacterInfo::Enumerate<BigDNA::Write>(athena::io::ISt
        sectionCount = 6;
    else if (animIdxs.size())
        sectionCount = 5;
-    else if (cmdlOverlay)
+    else if (cmdlIce)
        sectionCount = 4;
    else if (effects.size())
        sectionCount = 3;
@@ -472,8 +472,8 @@ void ANCS::CharacterSet::CharacterInfo::Enumerate<BigDNA::Write>(athena::io::ISt

    if (sectionCount > 3)
    {
-        cmdlOverlay.write(writer);
-        cskrOverlay.write(writer);
+        cmdlIce.write(writer);
+        cskrIce.write(writer);
    }

    if (sectionCount > 4)
@@ -494,7 +494,7 @@ void ANCS::CharacterSet::CharacterInfo::Enumerate<BigDNA::BinarySize>(size_t& __
        sectionCount = 6;
    else if (animIdxs.size())
        sectionCount = 5;
-    else if (cmdlOverlay)
+    else if (cmdlIce)
        sectionCount = 4;
    else if (effects.size())
        sectionCount = 3;
@@ -594,7 +594,7 @@ void ANCS::CharacterSet::CharacterInfo::Enumerate<BigDNA::ReadYaml>(athena::io::

    if (sectionCount > 3)
    {
-        reader.enumerate("cmdlOverride", cmdlOverlay);
+        reader.enumerate("cmdlIce", cmdlIce);
    }

    animIdxs.clear();
@@ -614,7 +614,7 @@ void ANCS::CharacterSet::CharacterInfo::Enumerate<BigDNA::WriteYaml>(athena::io:
        sectionCount = 6;
    else if (animIdxs.size())
        sectionCount = 5;
-    else if (cmdlOverlay)
+    else if (cmdlIce)
        sectionCount = 4;
    else if (effects.size())
        sectionCount = 3;
@@ -656,7 +656,7 @@ void ANCS::CharacterSet::CharacterInfo::Enumerate<BigDNA::WriteYaml>(athena::io:

    if (sectionCount > 3)
    {
-        writer.enumerate("cmdlOverride", cmdlOverlay);
+        writer.enumerate("cmdlIce", cmdlIce);
    }

    if (sectionCount > 4)
@@ -1179,8 +1179,8 @@ bool ANCS::Cook(const hecl::ProjectPath& outPath,
        ch.cmdl = UniqueID32{};
        ch.cskr = UniqueID32{};
        ch.cinf = UniqueID32{};
-        ch.cmdlOverlay = UniqueID32Zero{};
-        ch.cskrOverlay = UniqueID32Zero{};
+        ch.cmdlIce = UniqueID32Zero{};
+        ch.cskrIce = UniqueID32Zero{};

        hecl::SystemStringConv chSysName(ch.name);
        ch.cskr = inPath.ensureAuxInfo(hecl::SystemString(chSysName.sys_str()) + _S(".CSKR"));
@@ -1209,12 +1209,14 @@ bool ANCS::Cook(const hecl::ProjectPath& outPath,
                    hecl::SystemStringConv armSysName(arm.name);
                    ch.cinf = inPath.ensureAuxInfo(hecl::SystemString(armSysName.sys_str()) + _S(".CINF"));
                    ch.cmdl = sub.mesh;
-                    if (sub.overlayMeshes.size())
+                    auto search = std::find_if(sub.overlayMeshes.cbegin(), sub.overlayMeshes.cend(),
+                                               [](const auto& p) { return p.first == "ICE"; });
+                    if (search != sub.overlayMeshes.cend())
                    {
-                        hecl::SystemStringConv overlaySys(sub.overlayMeshes[0].first);
-                        ch.cmdlOverlay = sub.overlayMeshes[0].second;
-                        ch.cskrOverlay = inPath.ensureAuxInfo(hecl::SystemString(chSysName.sys_str()) + _S('.') +
-                                                              overlaySys.c_str() + _S(".CSKR"));
+                        hecl::SystemStringConv overlaySys(search->first);
+                        ch.cmdlIce = search->second;
+                        ch.cskrIce = inPath.ensureAuxInfo(hecl::SystemString(chSysName.sys_str()) + _S('.') +
+                                                          overlaySys.c_str() + _S(".CSKR"));
                    }
                }

@@ -1314,19 +1316,37 @@ bool ANCS::CookCSKR(const hecl::ProjectPath& outPath,
    }

    const DNAANCS::Actor::Subtype* subtype = nullptr;
-    for (const DNAANCS::Actor::Subtype& sub : actor.subtypes)
+    if (subName != "ATTACH")
    {
-        if (!sub.name.compare(subNameView.str()))
+        for (const DNAANCS::Actor::Subtype& sub : actor.subtypes)
        {
-            subtype = &sub;
-            break;
+            if (!sub.name.compare(subNameView.str()))
+            {
+                subtype = &sub;
+                break;
+            }
        }
+        if (!subtype)
+            Log.report(logvisor::Fatal, _S("unable to find subtype '%s'"), subName.c_str());
    }
-    if (!subtype)
-        Log.report(logvisor::Fatal, _S("unable to find subtype '%s'"), subName.c_str());

    const hecl::ProjectPath* modelPath = nullptr;
-    if (overName.empty())
+    if (subName == "ATTACH")
+    {
+        const DNAANCS::Actor::Attachment* attachment = nullptr;
+        for (const DNAANCS::Actor::Attachment& att : actor.attachments)
+        {
+            if (!att.name.compare(overNameView.str()))
+            {
+                attachment = &att;
+                break;
+            }
+        }
+        if (!attachment)
+            Log.report(logvisor::Fatal, _S("unable to find attachment '%s'"), overName.c_str());
+        modelPath = &attachment->mesh;
+    }
+    else if (overName.empty())
    {
        modelPath = &subtype->mesh;
    }
@@ -1434,19 +1454,37 @@ bool ANCS::CookCSKRPC(const hecl::ProjectPath& outPath,
    }

    const DNAANCS::Actor::Subtype* subtype = nullptr;
-    for (const DNAANCS::Actor::Subtype& sub : actor.subtypes)
+    if (subName != "ATTACH")
    {
-        if (!sub.name.compare(subNameView.str()))
+        for (const DNAANCS::Actor::Subtype& sub : actor.subtypes)
        {
-            subtype = &sub;
-            break;
+            if (!sub.name.compare(subNameView.str()))
+            {
+                subtype = &sub;
+                break;
+            }
        }
+        if (!subtype)
+            Log.report(logvisor::Fatal, _S("unable to find subtype '%s'"), subName.c_str());
    }
-    if (!subtype)
-        Log.report(logvisor::Fatal, _S("unable to find subtype '%s'"), subName.c_str());

    const hecl::ProjectPath* modelPath = nullptr;
-    if (overName.empty())
+    if (subName == "ATTACH")
+    {
+        const DNAANCS::Actor::Attachment* attachment = nullptr;
+        for (const DNAANCS::Actor::Attachment& att : actor.attachments)
+        {
+            if (!att.name.compare(overNameView.str()))
+            {
+                attachment = &att;
+                break;
+            }
+        }
+        if (!attachment)
+            Log.report(logvisor::Fatal, _S("unable to find attachment '%s'"), overName.c_str());
+        modelPath = &attachment->mesh;
+    }
+    else if (overName.empty())
    {
        modelPath = &subtype->mesh;
    }
--- a/DataSpec/DNAMP1/ANCS.hpp
+++ b/DataSpec/DNAMP1/ANCS.hpp
@@ -139,8 +139,8 @@ struct ANCS : BigDNA
            };
            std::vector<Effect> effects;

-            UniqueID32Zero cmdlOverlay;
-            UniqueID32Zero cskrOverlay;
+            UniqueID32Zero cmdlIce;
+            UniqueID32Zero cskrIce;

            std::vector<atUint32> animIdxs;
        };
@@ -431,8 +431,8 @@ struct ANCS : BigDNA
            chOut.cskr = ci.cskr;
            chOut.cinf = ci.cinf;

-            if (ci.cmdlOverlay)
-                chOut.overlays.emplace_back(FOURCC('OVER'), std::make_pair(ci.cmdlOverlay, ci.cskrOverlay));
+            if (ci.cmdlIce)
+                chOut.overlays.emplace_back("ICE", std::make_pair(ci.cmdlIce, ci.cskrIce));
        }
    }

--- a/DataSpec/DNAMP1/CMDL.cpp
+++ b/DataSpec/DNAMP1/CMDL.cpp
@@ -14,7 +14,7 @@ bool CMDL::Extract(const SpecBase& dataSpec,
                   std::function<void(const hecl::SystemChar*)> fileChanged)
 {
    /* Check for RigPair */
-    const PAKRouter<PAKBridge>::RigPair* rp = pakRouter.lookupCMDLRigPair(entry.id);
+    const typename CharacterAssociations<UniqueID32>::RigPair* rp = pakRouter.lookupCMDLRigPair(entry.id);
    CINF cinf;
    CSKR cskr;
    std::pair<CSKR*,CINF*> loadRp(nullptr, nullptr);
--- a/DataSpec/DNAMP1/DNAMP1.cpp
+++ b/DataSpec/DNAMP1/DNAMP1.cpp
@@ -216,9 +216,7 @@ void PAKBridge::build()
    }
 }

-void PAKBridge::addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-        std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo,
-        std::unordered_map<UniqueID32, std::pair<UniqueID32, std::string>>& cskrCinfToAncs) const
+void PAKBridge::addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
 {
    for (const std::pair<UniqueID32, PAK::Entry>& entry : m_pak.m_entries)
    {
@@ -229,23 +227,26 @@ void PAKBridge::addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
            ancs.read(rs);
            for (const ANCS::CharacterSet::CharacterInfo& ci : ancs.characterSet.characters)
            {
-                addTo[ci.cmdl] = std::make_pair(ci.cskr, ci.cinf);
-                cskrCinfToAncs[ci.cskr] = std::make_pair(entry.second.id, hecl::Format("%s.CSKR", ci.name.c_str()));
-                cskrCinfToAncs[ci.cinf] = std::make_pair(entry.second.id, hecl::Format("CINF_%08X.CINF", ci.cinf.toUint32()));
+                charAssoc.m_cmdlRigs[ci.cmdl] = std::make_pair(ci.cskr, ci.cinf);
+                charAssoc.m_cskrCinfToCharacter[ci.cskr] =
+                    std::make_pair(entry.second.id, hecl::Format("%s.CSKR", ci.name.c_str()));
+                charAssoc.m_cskrCinfToCharacter[ci.cinf] =
+                    std::make_pair(entry.second.id, hecl::Format("CINF_%08X.CINF", ci.cinf.toUint32()));
                PAK::Entry* cmdlEnt = (PAK::Entry*)m_pak.lookupEntry(ci.cmdl);
                PAK::Entry* cskrEnt = (PAK::Entry*)m_pak.lookupEntry(ci.cskr);
                PAK::Entry* cinfEnt = (PAK::Entry*)m_pak.lookupEntry(ci.cinf);
                cmdlEnt->name = hecl::Format("ANCS_%08X_%s_model", entry.first.toUint32(), ci.name.c_str());
                cskrEnt->name = hecl::Format("ANCS_%08X_%s_skin", entry.first.toUint32(), ci.name.c_str());
                cinfEnt->name = hecl::Format("ANCS_%08X_%s_skel", entry.first.toUint32(), ci.name.c_str());
-                if (ci.cmdlOverlay && ci.cskrOverlay)
+                if (ci.cmdlIce && ci.cskrIce)
                {
-                    addTo[ci.cmdlOverlay] = std::make_pair(ci.cskrOverlay, ci.cinf);
-                    cskrCinfToAncs[ci.cskrOverlay] = std::make_pair(entry.second.id, hecl::Format("%s.OVER.CSKR", ci.name.c_str()));
-                    PAK::Entry* cmdlEnt = (PAK::Entry*)m_pak.lookupEntry(ci.cmdlOverlay);
-                    PAK::Entry* cskrEnt = (PAK::Entry*)m_pak.lookupEntry(ci.cskrOverlay);
-                    cmdlEnt->name = hecl::Format("ANCS_%08X_%s_overmodel", entry.first.toUint32(), ci.name.c_str());
-                    cskrEnt->name = hecl::Format("ANCS_%08X_%s_overskin", entry.first.toUint32(), ci.name.c_str());
+                    charAssoc.m_cmdlRigs[ci.cmdlIce] = std::make_pair(ci.cskrIce, ci.cinf);
+                    charAssoc.m_cskrCinfToCharacter[ci.cskrIce] =
+                        std::make_pair(entry.second.id, hecl::Format("%s.ICE.CSKR", ci.name.c_str()));
+                    PAK::Entry* cmdlEnt = (PAK::Entry*)m_pak.lookupEntry(ci.cmdlIce);
+                    PAK::Entry* cskrEnt = (PAK::Entry*)m_pak.lookupEntry(ci.cskrIce);
+                    cmdlEnt->name = hecl::Format("ANCS_%08X_%s_icemodel", entry.first.toUint32(), ci.name.c_str());
+                    cskrEnt->name = hecl::Format("ANCS_%08X_%s_iceskin", entry.first.toUint32(), ci.name.c_str());
                }
            }
            std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID32>> animInfo;
@@ -254,19 +255,21 @@ void PAKBridge::addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
            {
                PAK::Entry* animEnt = (PAK::Entry*)m_pak.lookupEntry(ae.second.animId);
                animEnt->name = hecl::Format("ANCS_%08X_%s", entry.first.toUint32(), ae.second.name.c_str());
-                cskrCinfToAncs[ae.second.animId] = std::make_pair(entry.second.id, hecl::Format("%s.ANIM", ae.second.name.c_str()));
+                charAssoc.m_cskrCinfToCharacter[ae.second.animId] =
+                    std::make_pair(entry.second.id, hecl::Format("%s.ANIM", ae.second.name.c_str()));
                if (ae.second.evntId)
                {
                    PAK::Entry* evntEnt = (PAK::Entry*)m_pak.lookupEntry(ae.second.evntId);
                    evntEnt->name = hecl::Format("ANCS_%08X_%s_evnt", entry.first.toUint32(), ae.second.name.c_str());
-                    cskrCinfToAncs[ae.second.evntId] = std::make_pair(entry.second.id, hecl::Format("%s.evnt.yaml", ae.second.name.c_str()));
+                    charAssoc.m_cskrCinfToCharacter[ae.second.evntId] =
+                        std::make_pair(entry.second.id, hecl::Format("%s.evnt.yaml", ae.second.name.c_str()));
                }
            }
        }
        else if (entry.second.type == FOURCC('MREA'))
        {
            PAKEntryReadStream rs = entry.second.beginReadStream(m_node);
-            MREA::AddCMDLRigPairs(rs, pakRouter, addTo);
+            MREA::AddCMDLRigPairs(rs, pakRouter, charAssoc);
        }
    }
 }
--- a/DataSpec/DNAMP1/DNAMP1.hpp
+++ b/DataSpec/DNAMP1/DNAMP1.hpp
@@ -29,9 +29,7 @@ public:
    const PAKType& getPAK() const {return m_pak;}
    const nod::Node& getNode() const {return m_node;}

-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, std::string>>& cskrCinfToAncs) const;
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const;

    void addPATHToMREA(PAKRouter<PAKBridge>& pakRouter,
                       std::unordered_map<UniqueID32, UniqueID32>& pathToMrea) const;
--- a/DataSpec/DNAMP1/MREA.cpp
+++ b/DataSpec/DNAMP1/MREA.cpp
@@ -42,8 +42,7 @@ void MREA::ReadBabeDeadToBlender_1_2(hecl::blender::PyOutStream& os,
 }

 void MREA::AddCMDLRigPairs(PAKEntryReadStream& rs,
-                           PAKRouter<PAKBridge>& pakRouter,
-                           std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo)
+                           PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc)
 {
    /* Do extract */
    Header head;
@@ -58,7 +57,7 @@ void MREA::AddCMDLRigPairs(PAKEntryReadStream& rs,
    rs.seek(secStart, athena::Begin);
    SCLY scly;
    scly.read(rs);
-    scly.addCMDLRigPairs(pakRouter, addTo);
+    scly.addCMDLRigPairs(pakRouter, charAssoc);
 }

 UniqueID32 MREA::GetPATHId(PAKEntryReadStream& rs)
--- a/DataSpec/DNAMP1/MREA.hpp
+++ b/DataSpec/DNAMP1/MREA.hpp
@@ -102,8 +102,7 @@ struct MREA
                                          athena::io::IStreamReader& rs);

    static void AddCMDLRigPairs(PAKEntryReadStream& rs,
-                                PAKRouter<PAKBridge>& pakRouter,
-                                std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo);
+                                PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc);

    static UniqueID32 GetPATHId(PAKEntryReadStream& rs);

--- a/DataSpec/DNAMP1/SCLY.cpp
+++ b/DataSpec/DNAMP1/SCLY.cpp
@@ -63,18 +63,16 @@ void SCLY::exportToLayerDirectories(const PAK::Entry& entry, PAKRouter<PAKBridge
    }
 }

-void SCLY::addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-        std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+void SCLY::addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
 {
    for (const ScriptLayer& layer : layers)
-        layer.addCMDLRigPairs(pakRouter, addTo);
+        layer.addCMDLRigPairs(pakRouter, charAssoc);
 }

-void SCLY::ScriptLayer::addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-        std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const
+void SCLY::ScriptLayer::addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const
 {
    for (const std::unique_ptr<IScriptObject>& obj : objects)
-        obj->addCMDLRigPairs(pakRouter, addTo);
+        obj->addCMDLRigPairs(pakRouter, charAssoc);
 }

 void SCLY::nameIDs(PAKRouter<PAKBridge>& pakRouter) const
--- a/DataSpec/DNAMP1/SCLY.hpp
+++ b/DataSpec/DNAMP1/SCLY.hpp
@@ -21,15 +21,13 @@ struct SCLY : BigDNA
        Value<atUint8> unknown;
        Value<atUint32> objectCount;
        Vector<std::unique_ptr<IScriptObject>, AT_DNA_COUNT(objectCount)> objects;
-        void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-                std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const;
+        void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const;
        void nameIDs(PAKRouter<PAKBridge>& pakRouter) const;
    };
    Vector<ScriptLayer, AT_DNA_COUNT(layerCount)> layers;

    void exportToLayerDirectories(const PAK::Entry &, PAKRouter<PAKBridge>&, bool) const;
-    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
-            std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const;
+    void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const;
    void nameIDs(PAKRouter<PAKBridge>& pakRouter) const;
 };
 }
--- a/DataSpec/DNAMP1/ScriptObjects/Actor.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Actor.hpp
@@ -34,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
--- a/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp
@@ -26,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
--- a/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp
@@ -27,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
--- a/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp
@@ -25,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
--- a/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp
@@ -32,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
--- a/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp
@@ -26,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;
@@ -44,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
@@ -70,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)
@@ -120,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);
--- a/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp
@@ -27,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
--- a/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp
@@ -29,10 +29,9 @@ struct BloodFlower : IScriptObject
    UniqueID32 particle5;
    Value<float> 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
--- a/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp
@@ -24,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
--- a/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp
@@ -42,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
--- a/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp
@@ -25,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
--- a/DataSpec/DNAMP1/ScriptObjects/Drone.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Drone.hpp
@@ -56,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
--- a/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp
@@ -53,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
--- a/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp
@@ -31,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
--- a/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp
@@ -32,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
--- a/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp
@@ -20,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
--- a/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp
@@ -34,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
--- a/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp
@@ -17,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
--- a/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp
@@ -21,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
--- a/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp
@@ -47,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
--- a/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp
@@ -27,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
--- a/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp
@@ -59,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
--- a/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp
@@ -41,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 {}
--- a/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp
@@ -48,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
--- a/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp
@@ -27,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
--- a/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp
@@ -31,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
--- a/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp
@@ -22,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;
@@ -43,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)
@@ -76,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);
--- a/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp
@@ -23,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
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp
@@ -31,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
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp
@@ -34,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
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp
@@ -328,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
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp
@@ -22,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
--- a/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp
@@ -24,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
--- a/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp
@@ -29,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
--- a/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp
@@ -52,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
@@ -112,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");
@@ -145,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);
--- a/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp
@@ -402,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;
@@ -415,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";
        }
    }
@@ -453,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
--- a/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp
@@ -36,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
--- a/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp
@@ -20,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
--- a/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp
@@ -29,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
--- a/DataSpec/DNAMP1/ScriptObjects/Platform.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Platform.hpp
@@ -30,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
--- a/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp
@@ -30,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
--- a/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp
@@ -27,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
--- a/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp
@@ -28,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
--- a/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp
@@ -27,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
--- a/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp
@@ -130,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
--- a/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp
@@ -19,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
--- a/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp
@@ -25,10 +25,9 @@ struct Seedling : 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
--- a/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp
@@ -36,10 +36,9 @@ struct SnakeWeedSwarm : IScriptObject
    Value<atUint32> unknown18;
    Value<atUint32> 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, animationParameters.getCINF(pakRouter));
+        actorParameters.addCMDLRigPairs(pakRouter, charAssoc, animationParameters);
    }

    void nameIDs(PAKRouter<PAKBridge>& pakRouter) const
--- a/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp
@@ -47,10 +47,9 @@ struct SpacePirate : 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
--- a/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp
@@ -22,10 +22,9 @@ struct SpankWeed : 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
--- a/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp
@@ -35,10 +35,9 @@ struct Thardus : IScriptObject
    Value<atUint32> unknown11;
    Value<atUint32> unknown12;

-    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
--- a/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp
@@ -22,10 +22,9 @@ struct ThardusRockProjectile : IScriptObject
    UniqueID32 model;
    UniqueID32 stateMachine;

-    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
--- a/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp
@@ -21,10 +21,9 @@ struct Tryclops : IScriptObject
    Value<float> unknown3;
    Value<float> 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
--- a/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp
@@ -50,10 +50,9 @@ struct WallCrawlerSwarm : IScriptObject
    Value<atUint32> soundID1; // verification needed
    Value<atUint32> soundID2; // verification needed

-    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
--- a/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp
@@ -24,10 +24,9 @@ struct Warwasp : IScriptObject
    UniqueID32 particle;
    Value<atUint32> 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