Missing SCAN packaging fix

2025-12-08 19:44:55 +00:00 · 2018-05-07 16:11:07 -10:00
parent 9d25d44fe8
commit 70e791babc
83 changed files with 272 additions and 173 deletions
--- a/DataSpec/DNAMP1/ScriptObjects/Actor.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Actor.hpp
@@ -52,11 +52,12 @@ struct Actor : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(model, pathsOut);
        animationParameters.depANCS(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp
@@ -44,11 +44,12 @@ struct ActorContraption : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle, pathsOut);
        animationParameters.depANCS(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/AmbientAI.hpp
@@ -40,10 +40,11 @@ struct AmbientAI : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        animationParameters.depANCS(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/AreaAttributes.hpp
@@ -28,7 +28,8 @@ struct AreaAttributes : IScriptObject
    UniqueID32          skybox;
    Value<atUint32>     unknown6;

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(skybox, pathsOut);
    }
--- a/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp
@@ -48,12 +48,13 @@ struct AtomicAlpha : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc, pathsOut);
        g_curSpec->flattenDependencies(model, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp
@@ -60,13 +60,14 @@ struct AtomicBeta : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(elsc, pathsOut);
        g_curSpec->flattenDependencies(wpsc, pathsOut);
        g_curSpec->flattenDependencies(part, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp
@@ -115,7 +115,8 @@ struct Babygoth : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc1, pathsOut);
        g_curSpec->flattenDependencies(wpsc2, pathsOut);
@@ -129,7 +130,7 @@ struct Babygoth : IScriptObject
        g_curSpec->flattenDependencies(texture, pathsOut);
        g_curSpec->flattenDependencies(particle6, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp
@@ -45,11 +45,12 @@ struct Beetle : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(model, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp
@@ -77,7 +77,8 @@ struct BloodFlower : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc1, pathsOut);
        g_curSpec->flattenDependencies(wpsc2, pathsOut);
@@ -87,7 +88,7 @@ struct BloodFlower : IScriptObject
        g_curSpec->flattenDependencies(particle4, pathsOut);
        g_curSpec->flattenDependencies(particle5, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp
@@ -62,7 +62,8 @@ struct Burrower : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc, pathsOut);
        g_curSpec->flattenDependencies(particle1, pathsOut);
@@ -70,7 +71,7 @@ struct Burrower : IScriptObject
        g_curSpec->flattenDependencies(particle3, pathsOut);
        g_curSpec->flattenDependencies(particle4, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp
@@ -31,7 +31,8 @@ struct CameraFilterKeyframe : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(texture, pathsOut);
    }
--- a/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp
@@ -70,13 +70,14 @@ struct ChozoGhost : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc1, pathsOut);
        g_curSpec->flattenDependencies(wpsc2, pathsOut);
        g_curSpec->flattenDependencies(particle, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp
@@ -43,7 +43,8 @@ struct DamageableTrigger : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(patternTex1, pathsOut);
        g_curSpec->flattenDependencies(patternTex2, pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/Debris.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Debris.hpp
@@ -45,11 +45,12 @@ struct Debris : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(model, pathsOut);
        g_curSpec->flattenDependencies(particle, pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp
@@ -76,13 +76,14 @@ struct DebrisExtended : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(model, pathsOut);
        g_curSpec->flattenDependencies(particle1, pathsOut);
        g_curSpec->flattenDependencies(particle2, pathsOut);
        g_curSpec->flattenDependencies(particle3, pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp
@@ -38,10 +38,11 @@ struct DoorArea : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        animationParameters.depANCS(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Drone.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Drone.hpp
@@ -79,7 +79,8 @@ struct Drone : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(crsc, pathsOut);
        flareDefinition1.depIDs(pathsOut);
@@ -88,7 +89,7 @@ struct Drone : IScriptObject
        flareDefinition4.depIDs(pathsOut);
        flareDefinition5.depIDs(pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Effect.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Effect.hpp
@@ -50,7 +50,8 @@ struct Effect : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(part, pathsOut);
        g_curSpec->flattenDependencies(elsc, pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp
@@ -33,7 +33,8 @@ struct ElectroMagneticPulse : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle, pathsOut);
    }
--- a/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp
@@ -114,7 +114,8 @@ struct ElitePirate : IScriptObject
        animationParameters.nameANCS(pakRouter, name + "_animp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle1, pathsOut);
        g_curSpec->flattenDependencies(particle2, pathsOut);
@@ -126,8 +127,8 @@ struct ElitePirate : IScriptObject
        g_curSpec->flattenDependencies(particle7, pathsOut);
        g_curSpec->flattenDependencies(elsc, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters1.depIDs(pathsOut);
-        actorParameters2.depIDs(pathsOut);
+        actorParameters1.depIDs(pathsOut, lazyOut);
+        actorParameters2.depIDs(pathsOut, lazyOut);
        animationParameters.depANCS(pathsOut);
    }

--- a/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp
@@ -64,14 +64,15 @@ struct EnergyBall : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(texture, pathsOut);
        g_curSpec->flattenDependencies(particle1, pathsOut);
        g_curSpec->flattenDependencies(particle2, pathsOut);
        g_curSpec->flattenDependencies(elsc, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp
@@ -70,7 +70,8 @@ struct Eyeball : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc, pathsOut);
        g_curSpec->flattenDependencies(particle1, pathsOut);
@@ -78,7 +79,7 @@ struct Eyeball : IScriptObject
        g_curSpec->flattenDependencies(texture1, pathsOut);
        g_curSpec->flattenDependencies(texture2, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FireFlea.hpp
@@ -33,10 +33,11 @@ struct FireFlea : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp
@@ -78,7 +78,8 @@ struct FishCloud : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(model, pathsOut);
        animationParameters.depANCS(pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp
@@ -70,15 +70,16 @@ struct Flaahgra : IScriptObject
        animationParameters.nameANCS(pakRouter, name + "_animp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc1, pathsOut);
        g_curSpec->flattenDependencies(wpsc2, pathsOut);
        g_curSpec->flattenDependencies(particle, pathsOut);
        g_curSpec->flattenDependencies(dependencyGroup, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters1.depIDs(pathsOut);
-        actorParameters2.depIDs(pathsOut);
+        actorParameters1.depIDs(pathsOut, lazyOut);
+        actorParameters2.depIDs(pathsOut, lazyOut);
        animationParameters.depANCS(pathsOut);
    }

--- a/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FlaahgraTentacle.hpp
@@ -30,10 +30,11 @@ struct FlaahgraTentacle : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FlickerBat.hpp
@@ -34,10 +34,11 @@ struct FlickerBat : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp
@@ -95,7 +95,8 @@ struct FlyingPirate : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc1, pathsOut);
        g_curSpec->flattenDependencies(wpsc2, pathsOut);
@@ -105,7 +106,7 @@ struct FlyingPirate : IScriptObject
        g_curSpec->flattenDependencies(particle3, pathsOut);
        g_curSpec->flattenDependencies(particle4, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Geemer.hpp
@@ -40,10 +40,11 @@ struct Geemer : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp
@@ -117,7 +117,8 @@ struct GunTurret : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(unknown18, pathsOut);
        g_curSpec->flattenDependencies(model, pathsOut);
@@ -129,7 +130,7 @@ struct GunTurret : IScriptObject
        g_curSpec->flattenDependencies(particle6, pathsOut);
        g_curSpec->flattenDependencies(particle7, pathsOut);
        animationParameters.depANCS(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp
@@ -27,7 +27,8 @@ struct HUDMemo : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(message, pathsOut);
    }
--- a/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/IScriptObject.hpp
@@ -44,8 +44,8 @@ struct IScriptObject : BigDNAVYaml
    virtual void addCMDLRigPairs(PAKRouter<PAKBridge>&,
                                 std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>&) const {}
    virtual void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {}
-    virtual void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const {}
-    virtual void gatherLazyDependencies(std::vector<hecl::ProjectPath>& pathsOut) const {}
+    virtual void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                                    std::vector<hecl::ProjectPath>& lazyOut) const {}
    virtual void gatherScans(std::vector<Scan>& scansOut) const {}
    virtual zeus::CAABox getVISIAABB(hecl::blender::Token& btok) const { return {}; }
 };
--- a/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp
@@ -111,7 +111,8 @@ struct IceSheegoth : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc1, pathsOut);
        g_curSpec->flattenDependencies(wpsc2, pathsOut);
@@ -124,7 +125,7 @@ struct IceSheegoth : IScriptObject
        g_curSpec->flattenDependencies(texture, pathsOut);
        g_curSpec->flattenDependencies(particle6, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/IceZoomer.hpp
@@ -40,10 +40,11 @@ struct IceZoomer : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/JellyZap.hpp
@@ -44,10 +44,11 @@ struct JellyZap : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp
@@ -74,13 +74,14 @@ struct Magdolite : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    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(magdoliteParameters.particle, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetareeAlpha.hpp
@@ -36,10 +36,11 @@ struct MetareeAlpha : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidAlpha.hpp
@@ -48,10 +48,11 @@ struct MetroidAlpha : IScriptObject
        animationParameters4.nameANCS(pakRouter, name + "_animp4");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
        animationParameters1.depANCS(pathsOut);
        animationParameters2.depANCS(pathsOut);
        animationParameters3.depANCS(pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp
@@ -72,7 +72,8 @@ struct MetroidBeta : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle1, pathsOut);
        g_curSpec->flattenDependencies(particle2, pathsOut);
@@ -80,7 +81,7 @@ struct MetroidBeta : IScriptObject
        g_curSpec->flattenDependencies(particle4, pathsOut);
        g_curSpec->flattenDependencies(swhc, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp
@@ -303,7 +303,8 @@ struct MetroidPrimeStage1 : IScriptObject
            projectileInfo.nameIDs(pakRouter, name + "_projectileInfo");
        }

-        void depIDs(std::vector<hecl::ProjectPath>& pathsOut) const
+        void depIDs(std::vector<hecl::ProjectPath>& pathsOut,
+                    std::vector<hecl::ProjectPath>& lazyOut) const
        {
            primeStruct2b.depIDs(pathsOut);
            g_curSpec->flattenDependencies(particle4, pathsOut);
@@ -314,7 +315,7 @@ struct MetroidPrimeStage1 : IScriptObject
            g_curSpec->flattenDependencies(wpsc1, pathsOut);
            g_curSpec->flattenDependencies(wpsc2, pathsOut);
            patternedInfo.depIDs(pathsOut);
-            actorParameters.depIDs(pathsOut);
+            actorParameters.depIDs(pathsOut, lazyOut);
            primeStruct4s[0].depIDs(pathsOut);
            primeStruct4s[1].depIDs(pathsOut);
            primeStruct4s[2].depIDs(pathsOut);
@@ -340,9 +341,10 @@ struct MetroidPrimeStage1 : IScriptObject
        massivePrimeStruct.nameIDs(pakRouter, name + "_massiveStruct");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
-        massivePrimeStruct.depIDs(pathsOut);
+        massivePrimeStruct.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp
@@ -50,13 +50,14 @@ struct MetroidPrimeStage2 : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle1, pathsOut);
        g_curSpec->flattenDependencies(particle2, pathsOut);
        g_curSpec->flattenDependencies(elsc, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Midi.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Midi.hpp
@@ -27,7 +27,8 @@ struct Midi : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        // Dedicated PAK for this
        //g_curSpec->flattenDependencies(song, pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp
@@ -57,14 +57,15 @@ struct NewIntroBoss : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle1, pathsOut);
        g_curSpec->flattenDependencies(particle2, pathsOut);
        g_curSpec->flattenDependencies(texture1, pathsOut);
        g_curSpec->flattenDependencies(texture2, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Oculus.hpp
@@ -42,10 +42,11 @@ struct Oculus : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp
@@ -134,7 +134,8 @@ struct OmegaPirate : IScriptObject
        animationParameters.nameANCS(pakRouter, name + "_animp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath> &pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle1, pathsOut);
        g_curSpec->flattenDependencies(particle2, pathsOut);
@@ -149,8 +150,8 @@ struct OmegaPirate : IScriptObject
        g_curSpec->flattenDependencies(skin, pathsOut);
        g_curSpec->flattenDependencies(rig, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters1.depIDs(pathsOut);
-        actorParameters2.depIDs(pathsOut);
+        actorParameters1.depIDs(pathsOut, lazyOut);
+        actorParameters2.depIDs(pathsOut, lazyOut);
        animationParameters.depANCS(pathsOut);
    }

--- a/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp
@@ -444,10 +444,10 @@ struct ActorParameters : BigDNA
        }
    }

-    void depIDs(std::vector<hecl::ProjectPath>& pathsOut) const
+    void depIDs(std::vector<hecl::ProjectPath>& pathsOut,
+                std::vector<hecl::ProjectPath>& lazyOut) const
    {
-        // Scans aren't included as dependencies
-        //scannableParameters.depIDs(pathsOut);
+        scannableParameters.depIDs(lazyOut);
        g_curSpec->flattenDependencies(xrayModel, pathsOut);
        g_curSpec->flattenDependencies(xraySkin, pathsOut);
        g_curSpec->flattenDependencies(thermalModel, pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Parasite.hpp
@@ -49,10 +49,11 @@ struct Parasite : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp
@@ -38,11 +38,12 @@ struct PhazonHealingNodule : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(elsc, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp
@@ -54,7 +54,8 @@ struct PhazonPool : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle1, pathsOut);
        g_curSpec->flattenDependencies(particle2, pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp
@@ -52,12 +52,13 @@ struct Pickup : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle, pathsOut);
        g_curSpec->flattenDependencies(model, pathsOut);
        animationParameters.depANCS(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Platform.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Platform.hpp
@@ -53,12 +53,13 @@ struct Platform : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(dcln, pathsOut);
        g_curSpec->flattenDependencies(model, pathsOut);
        animationParameters.depANCS(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp
@@ -48,16 +48,13 @@ struct PlayerActor : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(model, pathsOut);
        animationParameters.depANCS(pathsOut);
-        actorParameters.depIDs(pathsOut);
-    }
-
-    void gatherLazyDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
-    {
-        animationParameters.depANCSAll(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
+        animationParameters.depANCSAll(lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PointOfInterest.hpp
@@ -23,9 +23,10 @@ struct PointOfInterest : IScriptObject
        scannableParameters.nameIDs(pakRouter, name + "_scanp");
    }

-    void gatherLazyDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
-        scannableParameters.depIDs(pathsOut);
+        scannableParameters.depIDs(lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp
@@ -50,12 +50,13 @@ struct PuddleSpore : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle, pathsOut);
        g_curSpec->flattenDependencies(wpsc, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp
@@ -46,11 +46,12 @@ struct PuddleToadGamma : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(dcln, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp
@@ -50,12 +50,13 @@ struct Puffer : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle, pathsOut);
        g_curSpec->flattenDependencies(texture, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp
@@ -234,7 +234,8 @@ struct Ridley : IScriptObject
        ridleyStruct1.nameIDs(pakRouter, name + "_ridley1");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle, pathsOut);
        g_curSpec->flattenDependencies(model1, pathsOut);
@@ -255,7 +256,7 @@ struct Ridley : IScriptObject
        g_curSpec->flattenDependencies(wpsc4, pathsOut);
        g_curSpec->flattenDependencies(elsc, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
        ridleyStruct1.depIDs(pathsOut);
    }

--- a/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Ripper.hpp
@@ -32,10 +32,11 @@ struct Ripper : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp
@@ -29,7 +29,8 @@ struct ScriptBeam : IScriptObject
        beamInfo.nameIDs(pakRouter, name + "_beamInfo");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc, pathsOut);
        beamInfo.depIDs(pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp
@@ -48,12 +48,13 @@ struct Seedling : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(unknown1, pathsOut);
        g_curSpec->flattenDependencies(unknown2, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/SnakeWeedSwarm.hpp
@@ -49,10 +49,11 @@ struct SnakeWeedSwarm : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        animationParameters.depANCS(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp
@@ -70,12 +70,13 @@ struct SpacePirate : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc1, pathsOut);
        g_curSpec->flattenDependencies(wpsc2, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/SpankWeed.hpp
@@ -35,10 +35,11 @@ struct SpankWeed : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Steam.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Steam.hpp
@@ -34,9 +34,10 @@ struct Steam : IScriptObject
        }
    }

-    void gatherLazyDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
-        g_curSpec->flattenDependencies(texture, pathsOut);
+        g_curSpec->flattenDependencies(texture, lazyOut);
    }
 };
 }
--- a/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp
@@ -178,7 +178,8 @@ struct Thardus : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        for (int i=0 ; i<14 ; ++i)
            g_curSpec->flattenDependencies(models[i], pathsOut);
@@ -190,7 +191,7 @@ struct Thardus : IScriptObject
        g_curSpec->flattenDependencies(particle, pathsOut);
        g_curSpec->flattenDependencies(texture, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp
@@ -45,12 +45,13 @@ struct ThardusRockProjectile : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(model, pathsOut);
        g_curSpec->flattenDependencies(stateMachine, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Tryclops.hpp
@@ -34,10 +34,11 @@ struct Tryclops : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/VisorFlare.hpp
@@ -31,7 +31,8 @@ struct VisorFlare : IScriptObject
        flareDefinitions[4].nameIDs(pakRouter, name + "_flare5");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        for (int i=0 ; i<5 ; ++i)
            flareDefinitions[i].depIDs(pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp
@@ -37,7 +37,8 @@ struct VisorGoo : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle, pathsOut);
        g_curSpec->flattenDependencies(electric, pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp
@@ -73,12 +73,13 @@ struct WallCrawlerSwarm : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(particle1, pathsOut);
        g_curSpec->flattenDependencies(particle2, pathsOut);
        animationParameters.depANCS(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp
@@ -47,12 +47,13 @@ struct Warwasp : IScriptObject
        actorParameters.nameIDs(pakRouter, name + "_actp");
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(wpsc1, pathsOut);
        g_curSpec->flattenDependencies(particle, pathsOut);
        patternedInfo.depIDs(pathsOut);
-        actorParameters.depIDs(pathsOut);
+        actorParameters.depIDs(pathsOut, lazyOut);
    }

    void gatherScans(std::vector<Scan>& scansOut) const
--- a/DataSpec/DNAMP1/ScriptObjects/Water.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Water.hpp
@@ -160,7 +160,8 @@ struct Water : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(patternMap1, pathsOut);
        g_curSpec->flattenDependencies(patternMap2, pathsOut);
--- a/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp
@@ -60,7 +60,8 @@ struct WorldTeleporter : IScriptObject
        }
    }

-    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const
+    void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
+                            std::vector<hecl::ProjectPath>& lazyOut) const
    {
        g_curSpec->flattenDependencies(model1, pathsOut);
        g_curSpec->flattenDependencies(model2, pathsOut);