Massive fmtlib refactor

2025-12-08 19:04:56 +00:00 · 2019-07-19 18:27:21 -10:00
parent e38a3ece89
commit 7a3da1f7a6
228 changed files with 2071 additions and 2116 deletions
--- a/DataSpec/DNAMP1/ScriptObjects/Actor.cpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Actor.cpp
@@ -7,13 +7,13 @@ zeus::CAABox Actor::getVISIAABB(hecl::blender::Token& btok) const {
  hecl::blender::Connection& conn = btok.getBlenderConnection();
  zeus::CAABox aabbOut;

-  if (model) {
+  if (model.isValid()) {
    hecl::ProjectPath path = UniqueIDBridge::TranslatePakIdToPath(model);
    conn.openBlend(path);
    hecl::blender::DataStream ds = conn.beginData();
    auto aabb = ds.getMeshAABB();
    aabbOut = zeus::CAABox(aabb.first, aabb.second);
-  } else if (animationParameters.animationCharacterSet) {
+  } else if (animationParameters.animationCharacterSet.isValid()) {
    hecl::ProjectPath path = UniqueIDBridge::TranslatePakIdToPath(animationParameters.animationCharacterSet);
    conn.openBlend(path.getWithExtension(_SYS_STR(".blend"), true));
    hecl::blender::DataStream ds = conn.beginData();
--- a/DataSpec/DNAMP1/ScriptObjects/Actor.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Actor.hpp
@@ -37,7 +37,7 @@ struct Actor : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (model) {
+    if (model.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
      ent->name = name + "_model";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ActorContraption.hpp
@@ -29,7 +29,7 @@ struct ActorContraption : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle) {
+    if (particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
      ent->name = name + "_part";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/AtomicAlpha.hpp
@@ -28,11 +28,11 @@ struct AtomicAlpha : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (wpsc) {
+    if (wpsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc);
      ent->name = name + "_wpsc";
    }
-    if (model) {
+    if (model.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
      ent->name = name + "_model";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/AtomicBeta.hpp
@@ -35,15 +35,15 @@ struct AtomicBeta : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (elsc) {
+    if (elsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(elsc);
      ent->name = name + "_elsc";
    }
-    if (wpsc) {
+    if (wpsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc);
      ent->name = name + "_wpsc";
    }
-    if (part) {
+    if (part.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(part);
      ent->name = name + "_part";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Babygoth.hpp
@@ -46,7 +46,7 @@ struct Babygoth : IScriptObject {
    UniqueID32 cinf = patternedInfo.animationParameters.getCINF(pakRouter);
    actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);

-    if (noShellModel && noShellSkin) {
+    if (noShellModel.isValid() && noShellSkin.isValid()) {
      charAssoc.m_cmdlRigs[noShellModel] = std::make_pair(noShellSkin, cinf);
      charAssoc.m_cskrCinfToCharacter[noShellSkin] =
          std::make_pair(patternedInfo.animationParameters.animationCharacterSet, "ATTACH.SHELLESS.CSKR");
@@ -55,47 +55,47 @@ struct Babygoth : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (fireballWeapon) {
+    if (fireballWeapon.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(fireballWeapon);
      ent->name = name + "_wpsc1";
    }
-    if (fireBreathWeapon) {
+    if (fireBreathWeapon.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(fireBreathWeapon);
      ent->name = name + "_wpsc2";
    }
-    if (fireBreathRes) {
+    if (fireBreathRes.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(fireBreathRes);
      ent->name = name + "_part1";
    }
-    if (noShellModel) {
+    if (noShellModel.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(noShellModel);
      ent->name = name + "_emodel";
    }
-    if (noShellSkin) {
+    if (noShellSkin.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(noShellSkin);
      ent->name = name + "_eskin";
    }
-    if (intermediateCrackParticle) {
+    if (intermediateCrackParticle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(intermediateCrackParticle);
      ent->name = name + "_part2";
    }
-    if (crackOneParticle) {
+    if (crackOneParticle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(crackOneParticle);
      ent->name = name + "_part3";
    }
-    if (crackTwoParticle) {
+    if (crackTwoParticle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(crackTwoParticle);
      ent->name = name + "_part4";
    }
-    if (destroyShellParticle) {
+    if (destroyShellParticle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(destroyShellParticle);
      ent->name = name + "_part5";
    }
-    if (flamePlayerSteamTxtr) {
+    if (flamePlayerSteamTxtr.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(flamePlayerSteamTxtr);
      ent->name = name + "_tex";
    }
-    if (flamePlayerIceTxtr) {
+    if (flamePlayerIceTxtr.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(flamePlayerIceTxtr);
      ent->name = name + "_part6";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Beetle.hpp
@@ -30,7 +30,7 @@ struct Beetle : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (tailModel) {
+    if (tailModel.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(tailModel);
      ent->name = name + "_tailModel";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/BloodFlower.hpp
@@ -32,31 +32,31 @@ struct BloodFlower : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (wpsc1) {
+    if (wpsc1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc1);
      ent->name = name + "_wpsc1";
    }
-    if (wpsc2) {
+    if (wpsc2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc2);
      ent->name = name + "_wpsc2";
    }
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (particle3) {
+    if (particle3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
      ent->name = name + "_part3";
    }
-    if (particle4) {
+    if (particle4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle4);
      ent->name = name + "_part4";
    }
-    if (particle5) {
+    if (particle5.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle5);
      ent->name = name + "_part5";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Burrower.hpp
@@ -27,23 +27,23 @@ struct Burrower : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (wpsc) {
+    if (wpsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc);
      ent->name = name + "_wpsc";
    }
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (particle3) {
+    if (particle3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
      ent->name = name + "_part3";
    }
-    if (particle4) {
+    if (particle4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle4);
      ent->name = name + "_part4";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/CameraFilterKeyframe.hpp
@@ -20,7 +20,7 @@ struct CameraFilterKeyframe : IScriptObject {
  UniqueID32 texture;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (texture) {
+    if (texture.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture);
      ent->name = name + "_texture";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ChozoGhost.hpp
@@ -45,15 +45,15 @@ struct ChozoGhost : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (wpsc1) {
+    if (wpsc1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc1);
      ent->name = name + "_wpsc1";
    }
-    if (wpsc2) {
+    if (wpsc2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc2);
      ent->name = name + "_wpsc2";
    }
-    if (particle) {
+    if (particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
      ent->name = name + "_part";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp
@@ -22,15 +22,15 @@ struct DamageableTrigger : IScriptObject {
  VisorParameters visorParameters;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (patternTex1) {
+    if (patternTex1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(patternTex1);
      ent->name = name + "_patternTex1";
    }
-    if (patternTex2) {
+    if (patternTex2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(patternTex2);
      ent->name = name + "_patternTex2";
    }
-    if (colorTex) {
+    if (colorTex.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(colorTex);
      ent->name = name + "_colorTex";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Debris.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Debris.hpp
@@ -28,11 +28,11 @@ struct Debris : IScriptObject {
  Value<bool> active;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (model) {
+    if (model.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
      ent->name = name + "_model";
    }
-    if (particle) {
+    if (particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
      ent->name = name + "_part";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/DebrisExtended.hpp
@@ -49,19 +49,19 @@ struct DebrisExtended : IScriptObject {
  Value<bool> active;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (model) {
+    if (model.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
      ent->name = name + "_model";
    }
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (particle3) {
+    if (particle3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
      ent->name = name + "_part3";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/DoorArea.cpp
+++ b/DataSpec/DNAMP1/ScriptObjects/DoorArea.cpp
@@ -7,7 +7,7 @@ zeus::CAABox DoorArea::getVISIAABB(hecl::blender::Token& btok) const {
  hecl::blender::Connection& conn = btok.getBlenderConnection();
  zeus::CAABox aabbOut;

-  if (animationParameters.animationCharacterSet) {
+  if (animationParameters.animationCharacterSet.isValid()) {
    hecl::ProjectPath path = UniqueIDBridge::TranslatePakIdToPath(animationParameters.animationCharacterSet);
    conn.openBlend(path.getWithExtension(_SYS_STR(".blend"), true));
    hecl::blender::DataStream ds = conn.beginData();
--- a/DataSpec/DNAMP1/ScriptObjects/Drone.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Drone.hpp
@@ -59,7 +59,7 @@ struct Drone : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (crsc) {
+    if (crsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(crsc);
      ent->name = name + "_crsc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Effect.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Effect.hpp
@@ -34,11 +34,11 @@ struct Effect : IScriptObject {
  LightParameters lightParameters;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (part) {
+    if (part.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(part);
      ent->name = name + "_part";
    }
-    if (elsc) {
+    if (elsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(elsc);
      ent->name = name + "_elsc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ElectroMagneticPulse.hpp
@@ -22,7 +22,7 @@ struct ElectroMagneticPulse : IScriptObject {
  UniqueID32 particle;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle) {
+    if (particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
      ent->name = name + "_part";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ElitePirate.hpp
@@ -57,39 +57,39 @@ struct ElitePirate : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (model) {
+    if (model.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
      ent->name = name + "_model";
    }
-    if (particle3) {
+    if (particle3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
      ent->name = name + "_part3";
    }
-    if (particle4) {
+    if (particle4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle4);
      ent->name = name + "_part4";
    }
-    if (particle5) {
+    if (particle5.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle5);
      ent->name = name + "_part5";
    }
-    if (particle6) {
+    if (particle6.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle6);
      ent->name = name + "_part6";
    }
-    if (particle7) {
+    if (particle7.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle7);
      ent->name = name + "_part7";
    }
-    if (elsc) {
+    if (elsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(elsc);
      ent->name = name + "_elsc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/EnergyBall.hpp
@@ -34,19 +34,19 @@ struct EnergyBall : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (texture) {
+    if (texture.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture);
      ent->name = name + "_texture";
    }
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (elsc) {
+    if (elsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(elsc);
      ent->name = name + "_elsc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Eyeball.hpp
@@ -35,23 +35,23 @@ struct Eyeball : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (wpsc) {
+    if (wpsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc);
      ent->name = name + "_wpsc";
    }
-    if (beamContactFxId) {
+    if (beamContactFxId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(beamContactFxId);
      ent->name = name + "_part1";
    }
-    if (beamPulseFxId) {
+    if (beamPulseFxId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(beamPulseFxId);
      ent->name = name + "_part2";
    }
-    if (beamTextureId) {
+    if (beamTextureId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(beamTextureId);
      ent->name = name + "_tex1";
    }
-    if (beamGlowTextureId) {
+    if (beamGlowTextureId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(beamGlowTextureId);
      ent->name = name + "_tex2";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FishCloud.hpp
@@ -46,24 +46,24 @@ struct FishCloud : IScriptObject {
  Value<bool> hotInThermal;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (model) {
+    if (model.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
      ent->name = name + "_model";
    }
    animationParameters.nameANCS(pakRouter, name + "_animp");
-    if (deathParticle1) {
+    if (deathParticle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(deathParticle1);
      ent->name = name + "_deathParticle1";
    }
-    if (deathParticle2) {
+    if (deathParticle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(deathParticle2);
      ent->name = name + "_deathParticle2";
    }
-    if (deathParticle3) {
+    if (deathParticle3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(deathParticle3);
      ent->name = name + "_deathParticle3";
    }
-    if (deathParticle4) {
+    if (deathParticle4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(deathParticle4);
      ent->name = name + "_deathParticle4";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Flaahgra.hpp
@@ -38,19 +38,19 @@ struct Flaahgra : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (wpsc1) {
+    if (wpsc1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc1);
      ent->name = name + "_wpsc1";
    }
-    if (wpsc2) {
+    if (wpsc2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc2);
      ent->name = name + "_wpsc2";
    }
-    if (particle) {
+    if (particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
      ent->name = name + "_part";
    }
-    if (dependencyGroup) {
+    if (dependencyGroup.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(dependencyGroup);
      ent->name = name + "_dgrp";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/FlyingPirate.hpp
@@ -50,31 +50,31 @@ struct FlyingPirate : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (wpsc1) {
+    if (wpsc1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc1);
      ent->name = name + "_wpsc1";
    }
-    if (wpsc2) {
+    if (wpsc2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc2);
      ent->name = name + "_wpsc2";
    }
-    if (wpsc3) {
+    if (wpsc3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc3);
      ent->name = name + "_wpsc3";
    }
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (particle3) {
+    if (particle3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
      ent->name = name + "_part3";
    }
-    if (particle4) {
+    if (particle4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle4);
      ent->name = name + "_part4";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/GunTurret.hpp
@@ -62,39 +62,39 @@ struct GunTurret : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (projectileRes) {
+    if (projectileRes.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(projectileRes);
      ent->name = name + "_projectileRes";
    }
-    if (idleLightRes) {
+    if (idleLightRes.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(idleLightRes);
      ent->name = name + "_idleLightRes";
    }
-    if (deactivateLightRes) {
+    if (deactivateLightRes.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(deactivateLightRes);
      ent->name = name + "_deactivateLightRes";
    }
-    if (targettingLightRes) {
+    if (targettingLightRes.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(targettingLightRes);
      ent->name = name + "_targettingLightRes";
    }
-    if (frozenEffectRes) {
+    if (frozenEffectRes.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(frozenEffectRes);
      ent->name = name + "_frozenEffectRes";
    }
-    if (chargingEffectRes) {
+    if (chargingEffectRes.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(chargingEffectRes);
      ent->name = name + "_chargingEffectRes";
    }
-    if (panningEffectRes) {
+    if (panningEffectRes.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(panningEffectRes);
      ent->name = name + "_panningEffectRes";
    }
-    if (visorEffectRes) {
+    if (visorEffectRes.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(visorEffectRes);
      ent->name = name + "_visorEffectRes";
    }
-    if (extensionModelResId) {
+    if (extensionModelResId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(extensionModelResId);
      ent->name = name + "_extensionModelResId";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/HUDMemo.hpp
@@ -16,7 +16,7 @@ struct HUDMemo : IScriptObject {
  Value<bool> active;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (message) {
+    if (message.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(message);
      ent->name = name + "_message";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/IceSheegoth.hpp
@@ -51,43 +51,43 @@ struct IceSheegoth : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (wpsc1) {
+    if (wpsc1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc1);
      ent->name = name + "_wpsc1";
    }
-    if (wpsc2) {
+    if (wpsc2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc2);
      ent->name = name + "_wpsc2";
    }
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (particle3) {
+    if (particle3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
      ent->name = name + "_part3";
    }
-    if (particle4) {
+    if (particle4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle4);
      ent->name = name + "_part4";
    }
-    if (particle5) {
+    if (particle5.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle5);
      ent->name = name + "_part5";
    }
-    if (elsc) {
+    if (elsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(elsc);
      ent->name = name + "_elsc";
    }
-    if (texture) {
+    if (texture.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture);
      ent->name = name + "_texture";
    }
-    if (particle6) {
+    if (particle6.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle6);
      ent->name = name + "_part6";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Magdolite.hpp
@@ -44,7 +44,7 @@ struct Magdolite : IScriptObject {
    UniqueID32 cinf = patternedInfo.animationParameters.getCINF(pakRouter);
    actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);

-    if (cmdlHeadless && cskrHeadless) {
+    if (cmdlHeadless.isValid() && cskrHeadless.isValid()) {
      charAssoc.m_cmdlRigs[cmdlHeadless] = std::make_pair(cskrHeadless, cinf);
      charAssoc.m_cskrCinfToCharacter[cskrHeadless] =
          std::make_pair(patternedInfo.animationParameters.animationCharacterSet, "ATTACH.HEADLESS.CSKR");
@@ -53,15 +53,15 @@ struct Magdolite : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (cmdlHeadless) {
+    if (cmdlHeadless.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cmdlHeadless);
      ent->name = name + "_emodel";
    }
-    if (cskrHeadless) {
+    if (cskrHeadless.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cskrHeadless);
      ent->name = name + "_eskin";
    }
-    if (magdoliteParameters.particle) {
+    if (magdoliteParameters.particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(magdoliteParameters.particle);
      ent->name = name + "_part";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidBeta.hpp
@@ -37,23 +37,23 @@ struct MetroidBeta : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (particle3) {
+    if (particle3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
      ent->name = name + "_part3";
    }
-    if (particle4) {
+    if (particle4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle4);
      ent->name = name + "_part4";
    }
-    if (swhc) {
+    if (swhc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(swhc);
      ent->name = name + "_swhc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp
@@ -86,19 +86,19 @@ struct MetroidPrimeStage1 : IScriptObject {
      Value<atUint32> unknown8;

      void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
-        if (particle1) {
+        if (particle1.isValid()) {
          PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
          ent->name = name + "_part1";
        }
-        if (particle2) {
+        if (particle2.isValid()) {
          PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
          ent->name = name + "_part2";
        }
-        if (particle3) {
+        if (particle3.isValid()) {
          PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
          ent->name = name + "_part3";
        }
-        if (texture1) {
+        if (texture1.isValid()) {
          PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture1);
          ent->name = name + "_tex1";
        }
@@ -132,15 +132,15 @@ struct MetroidPrimeStage1 : IScriptObject {
        Value<atUint32> unknown8;

        void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
-          if (unknown1) {
+          if (unknown1.isValid()) {
            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(unknown1);
            ent->name = name + "_unk1";
          }
-          if (unknown3) {
+          if (unknown3.isValid()) {
            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(unknown3);
            ent->name = name + "_unk3";
          }
-          if (unknown4) {
+          if (unknown4.isValid()) {
            PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(unknown4);
            ent->name = name + "_unk4";
          }
@@ -157,7 +157,7 @@ struct MetroidPrimeStage1 : IScriptObject {

      void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
        beamInfo.nameIDs(pakRouter, name + "_beamInfo");
-        if (wpsc) {
+        if (wpsc.isValid()) {
          PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc);
          ent->name = name + "_wpsc";
        }
@@ -193,11 +193,11 @@ struct MetroidPrimeStage1 : IScriptObject {
      Value<bool> unknown15;

      void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
-        if (particle) {
+        if (particle.isValid()) {
          PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
          ent->name = name + "_part";
        }
-        if (texture) {
+        if (texture.isValid()) {
          PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture);
          ent->name = name + "_tex";
        }
@@ -227,31 +227,31 @@ struct MetroidPrimeStage1 : IScriptObject {

    void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
      primeStruct2b.nameIDs(pakRouter, name + "_prime2b");
-      if (particle4) {
+      if (particle4.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle4);
        ent->name = name + "_part4";
      }
-      if (particle6) {
+      if (particle6.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle6);
        ent->name = name + "_part6";
      }
-      if (particle7) {
+      if (particle7.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle7);
        ent->name = name + "_part7";
      }
-      if (particle8) {
+      if (particle8.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle8);
        ent->name = name + "_part8";
      }
-      if (swhc) {
+      if (swhc.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(swhc);
        ent->name = name + "_swhc";
      }
-      if (wpsc1) {
+      if (wpsc1.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc1);
        ent->name = name + "_wpsc1";
      }
-      if (wpsc2) {
+      if (wpsc2.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc2);
        ent->name = name + "_wpsc2";
      }
--- a/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage2.hpp
@@ -25,15 +25,15 @@ struct MetroidPrimeStage2 : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (elsc) {
+    if (elsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(elsc);
      ent->name = name + "_elsc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Midi.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Midi.hpp
@@ -16,7 +16,7 @@ struct Midi : IScriptObject {
  Value<atUint32> volume;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (song) {
+    if (song.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(song);
      ent->name = name + "_song";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/NewIntroBoss.hpp
@@ -27,19 +27,19 @@ struct NewIntroBoss : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (beamContactFxId) {
+    if (beamContactFxId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(beamContactFxId);
      ent->name = name + "_beamContactFxId";
    }
-    if (beamPulseFxId) {
+    if (beamPulseFxId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(beamPulseFxId);
      ent->name = name + "_beamPulseFxId";
    }
-    if (beamTextureId) {
+    if (beamTextureId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(beamTextureId);
      ent->name = name + "_beamTextureId";
    }
-    if (beamGlowTextureId) {
+    if (beamGlowTextureId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(beamGlowTextureId);
      ent->name = name + "_beamGlowTextureId";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/OmegaPirate.hpp
@@ -57,64 +57,64 @@ struct OmegaPirate : IScriptObject {
  void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const {
    actorParameters1.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
    actorParameters2.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
-    if (cmdlPhazonVeins && cskrPhazonVeins && cinfPhazonVeins) {
+    if (cmdlPhazonVeins.isValid() && cskrPhazonVeins.isValid() && cinfPhazonVeins.isValid()) {
      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()));
+                         fmt::format(fmt("CINF_{}.CINF"), cinfPhazonVeins));
      charAssoc.addAttachmentRig(patternedInfo.animationParameters.animationCharacterSet, cinfPhazonVeins,
                                 cmdlPhazonVeins, "VEINS");
    }
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (particle3) {
+    if (particle3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle3);
      ent->name = name + "_part3";
    }
-    if (particle4) {
+    if (particle4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle4);
      ent->name = name + "_part4";
    }
-    if (particle5) {
+    if (particle5.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle5);
      ent->name = name + "_part5";
    }
-    if (particle6) {
+    if (particle6.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle6);
      ent->name = name + "_part6";
    }
-    if (particle7) {
+    if (particle7.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle7);
      ent->name = name + "_part7";
    }
-    if (elsc) {
+    if (elsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(elsc);
      ent->name = name + "_elsc";
    }
-    if (model1) {
+    if (model1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model1);
      ent->name = name + "_model1";
    }
-    if (cmdlPhazonVeins) {
+    if (cmdlPhazonVeins.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cmdlPhazonVeins);
      ent->name = name + "_model2";
    }
-    if (cskrPhazonVeins) {
+    if (cskrPhazonVeins.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cskrPhazonVeins);
      ent->name = name + "_skin";
    }
-    if (cinfPhazonVeins) {
+    if (cinfPhazonVeins.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(cinfPhazonVeins);
      ent->name = name + "_rig";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Parameters.cpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Parameters.cpp
@@ -4,7 +4,7 @@
 namespace DataSpec::DNAMP1 {

 UniqueID32 AnimationParameters::getCINF(PAKRouter<PAKBridge>& pakRouter) const {
-  if (!animationCharacterSet)
+  if (!animationCharacterSet.isValid())
    return UniqueID32();
  const nod::Node* node;
  const PAK::Entry* ancsEnt = pakRouter.lookupEntry(animationCharacterSet, &node);
--- a/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Parameters.hpp
@@ -96,7 +96,7 @@ struct AnimationParameters : BigDNA {
  UniqueID32 getCINF(PAKRouter<PAKBridge>& pakRouter) const;

  void nameANCS(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
-    if (!animationCharacterSet)
+    if (!animationCharacterSet.isValid())
      return;
    PAK::Entry* ancsEnt = (PAK::Entry*)pakRouter.lookupEntry(animationCharacterSet);
    if (ancsEnt->name.empty())
@@ -182,7 +182,7 @@ struct FlareDefinition : BigDNA {
  Value<atVec4f> unknown4; // CColor

  void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
-    if (texture) {
+    if (texture.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture);
      ent->name = name + "_texture";
    }
@@ -278,19 +278,19 @@ struct PatternedInfo : BigDNA {

  void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
    animationParameters.nameANCS(pakRouter, name + "_animp");
-    if (stateMachine) {
+    if (stateMachine.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(stateMachine);
      ent->name = name + "_fsm";
    }
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (electric) {
+    if (electric.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(electric);
      ent->name = name + "_elsc";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
@@ -331,7 +331,7 @@ struct ScannableParameters : BigDNA {
  UniqueID32 scanId;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
-    if (scanId) {
+    if (scanId.isValid()) {
      PAK::Entry* scanEnt = (PAK::Entry*)pakRouter.lookupEntry(scanId);
      scanEnt->name = name + "_scan";
    }
@@ -377,12 +377,12 @@ struct ActorParameters : BigDNA {
  void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc,
                       const AnimationParameters& animParms) const {
    auto cinf = animParms.getCINF(pakRouter);
-    if (cmdlXray && cskrXray) {
+    if (cmdlXray.isValid() && cskrXray.isValid()) {
      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) {
+    if (cmdlThermal.isValid() && cskrThermal.isValid()) {
      charAssoc.m_cmdlRigs[cmdlThermal] = std::make_pair(cskrThermal, cinf);
      charAssoc.m_cskrCinfToCharacter[cskrThermal] =
          std::make_pair(animParms.animationCharacterSet, "ATTACH.THERMAL.CSKR");
@@ -392,19 +392,19 @@ struct ActorParameters : BigDNA {

  void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
    scannableParameters.nameIDs(pakRouter, name);
-    if (cmdlXray) {
+    if (cmdlXray.isValid()) {
      PAK::Entry* xmEnt = (PAK::Entry*)pakRouter.lookupEntry(cmdlXray);
      xmEnt->name = name + "_xraymodel";
    }
-    if (cskrXray) {
+    if (cskrXray.isValid()) {
      PAK::Entry* xsEnt = (PAK::Entry*)pakRouter.lookupEntry(cskrXray);
      xsEnt->name = name + "_xrayskin";
    }
-    if (cmdlThermal) {
+    if (cmdlThermal.isValid()) {
      PAK::Entry* xmEnt = (PAK::Entry*)pakRouter.lookupEntry(cmdlThermal);
      xmEnt->name = name + "_thermalmodel";
    }
-    if (cskrThermal) {
+    if (cskrThermal.isValid()) {
      PAK::Entry* xsEnt = (PAK::Entry*)pakRouter.lookupEntry(cskrThermal);
      xsEnt->name = name + "_thermalskin";
    }
@@ -442,19 +442,19 @@ struct BeamInfo : BigDNA {
  DNAColor outerColor;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
-    if (contactFxId) {
+    if (contactFxId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(contactFxId);
      ent->name = name + "_part1";
    }
-    if (pulseFxId) {
+    if (pulseFxId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(pulseFxId);
      ent->name = name + "_part2";
    }
-    if (textureId) {
+    if (textureId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(textureId);
      ent->name = name + "_tex1";
    }
-    if (glowTextureId) {
+    if (glowTextureId.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(glowTextureId);
      ent->name = name + "_tex2";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PhazonHealingNodule.hpp
@@ -23,7 +23,7 @@ struct PhazonHealingNodule : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (elsc) {
+    if (elsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(elsc);
      ent->name = name + "_elsc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PhazonPool.hpp
@@ -28,19 +28,19 @@ struct PhazonPool : IScriptObject {
  Value<float> unknown9;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle1) {
+    if (particle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
      ent->name = name + "_part1";
    }
-    if (particle2) {
+    if (particle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
      ent->name = name + "_part2";
    }
-    if (model1) {
+    if (model1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model1);
      ent->name = name + "_model1";
    }
-    if (model2) {
+    if (model2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model2);
      ent->name = name + "_model2";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Pickup.hpp
@@ -33,11 +33,11 @@ struct Pickup : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (pickupParticle) {
+    if (pickupParticle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(pickupParticle);
      ent->name = name + "_part";
    }
-    if (model) {
+    if (model.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
      ent->name = name + "_model";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Platform.cpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Platform.cpp
@@ -7,13 +7,13 @@ zeus::CAABox Platform::getVISIAABB(hecl::blender::Token& btok) const {
  hecl::blender::Connection& conn = btok.getBlenderConnection();
  zeus::CAABox aabbOut;

-  if (model) {
+  if (model.isValid()) {
    hecl::ProjectPath path = UniqueIDBridge::TranslatePakIdToPath(model);
    conn.openBlend(path);
    hecl::blender::DataStream ds = conn.beginData();
    auto aabb = ds.getMeshAABB();
    aabbOut = zeus::CAABox(aabb.first, aabb.second);
-  } else if (animationParameters.animationCharacterSet) {
+  } else if (animationParameters.animationCharacterSet.isValid()) {
    hecl::ProjectPath path = UniqueIDBridge::TranslatePakIdToPath(animationParameters.animationCharacterSet);
    conn.openBlend(path.getWithExtension(_SYS_STR(".blend"), true));
    hecl::blender::DataStream ds = conn.beginData();
--- a/DataSpec/DNAMP1/ScriptObjects/Platform.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Platform.hpp
@@ -33,11 +33,11 @@ struct Platform : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (dcln) {
+    if (dcln.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(dcln);
      ent->name = name + "_dcln";
    }
-    if (model) {
+    if (model.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
      ent->name = name + "_model";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PlayerActor.hpp
@@ -33,7 +33,7 @@ struct PlayerActor : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (model) {
+    if (model.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
      ent->name = name + "_model";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PuddleSpore.hpp
@@ -30,11 +30,11 @@ struct PuddleSpore : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle) {
+    if (particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
      ent->name = name + "_part";
    }
-    if (wpsc) {
+    if (wpsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc);
      ent->name = name + "_wpsc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/PuddleToadGamma.hpp
@@ -31,7 +31,7 @@ struct PuddleToadGamma : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (dcln) {
+    if (dcln.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(dcln);
      ent->name = name + "_dcln";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Puffer.hpp
@@ -30,11 +30,11 @@ struct Puffer : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle) {
+    if (particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
      ent->name = name + "_part";
    }
-    if (texture) {
+    if (texture.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture);
      ent->name = name + "_texture";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Ridley.hpp
@@ -54,19 +54,19 @@ struct Ridley : IScriptObject {
    Value<atVec4f> unknown13; // CColor

    void nameIDs(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const {
-      if (particle1) {
+      if (particle1.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle1);
        ent->name = name + "_part1";
      }
-      if (particle2) {
+      if (particle2.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle2);
        ent->name = name + "_part2";
      }
-      if (texture1) {
+      if (texture1.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture1);
        ent->name = name + "_tex1";
      }
-      if (texture2) {
+      if (texture2.isValid()) {
        PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture2);
        ent->name = name + "_tex2";
      }
@@ -125,75 +125,75 @@ struct Ridley : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle) {
+    if (particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
      ent->name = name + "_part";
    }
-    if (model1) {
+    if (model1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model1);
      ent->name = name + "_model1";
    }
-    if (model2) {
+    if (model2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model2);
      ent->name = name + "_model2";
    }
-    if (model3) {
+    if (model3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model3);
      ent->name = name + "_model3";
    }
-    if (model4) {
+    if (model4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model4);
      ent->name = name + "_model4";
    }
-    if (model5) {
+    if (model5.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model5);
      ent->name = name + "_model5";
    }
-    if (model6) {
+    if (model6.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model6);
      ent->name = name + "_model6";
    }
-    if (model7) {
+    if (model7.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model7);
      ent->name = name + "_model7";
    }
-    if (model8) {
+    if (model8.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model8);
      ent->name = name + "_model8";
    }
-    if (model9) {
+    if (model9.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model9);
      ent->name = name + "_model9";
    }
-    if (model10) {
+    if (model10.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model10);
      ent->name = name + "_model10";
    }
-    if (model11) {
+    if (model11.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model11);
      ent->name = name + "_model11";
    }
-    if (model12) {
+    if (model12.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model12);
      ent->name = name + "_model12";
    }
-    if (wpsc1) {
+    if (wpsc1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc1);
      ent->name = name + "_wpsc1";
    }
-    if (wpsc2) {
+    if (wpsc2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc2);
      ent->name = name + "_wpsc2";
    }
-    if (wpsc3) {
+    if (wpsc3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc3);
      ent->name = name + "_wpsc3";
    }
-    if (wpsc4) {
+    if (wpsc4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc4);
      ent->name = name + "_wpsc4";
    }
-    if (elsc) {
+    if (elsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(elsc);
      ent->name = name + "_elsc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ScriptBeam.hpp
@@ -17,7 +17,7 @@ struct ScriptBeam : IScriptObject {
  DamageInfo damageInfo;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (wpsc) {
+    if (wpsc.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(wpsc);
      ent->name = name + "_wpsc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Seedling.hpp
@@ -28,11 +28,11 @@ struct Seedling : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (unknown1) {
+    if (unknown1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(unknown1);
      ent->name = name + "_unk1";
    }
-    if (unknown2) {
+    if (unknown2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(unknown2);
      ent->name = name + "_unk2";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/SpacePirate.hpp
@@ -69,11 +69,11 @@ struct SpacePirate : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (Projectile) {
+    if (Projectile.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(Projectile);
      ent->name = name + "_Projectile";
    }
-    if (KneelAttackShot) {
+    if (KneelAttackShot.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(KneelAttackShot);
      ent->name = name + "_KneelAttackShot";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Steam.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Steam.hpp
@@ -23,7 +23,7 @@ struct Steam : IScriptObject {
  Value<bool> unknown8;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (texture) {
+    if (texture.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture);
      ent->name = name + "_texture";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Thardus.hpp
@@ -38,107 +38,107 @@ struct Thardus : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (models[0]) {
+    if (models[0].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[0]);
      ent->name = name + "_model1";
    }
-    if (models[1]) {
+    if (models[1].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[1]);
      ent->name = name + "_model2";
    }
-    if (models[2]) {
+    if (models[2].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[2]);
      ent->name = name + "_model3";
    }
-    if (models[3]) {
+    if (models[3].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[3]);
      ent->name = name + "_model4";
    }
-    if (models[4]) {
+    if (models[4].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[4]);
      ent->name = name + "_model5";
    }
-    if (models[5]) {
+    if (models[5].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[5]);
      ent->name = name + "_model6";
    }
-    if (models[6]) {
+    if (models[6].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[6]);
      ent->name = name + "_model7";
    }
-    if (models[7]) {
+    if (models[7].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[7]);
      ent->name = name + "_model8";
    }
-    if (models[8]) {
+    if (models[8].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[8]);
      ent->name = name + "_model9";
    }
-    if (models[9]) {
+    if (models[9].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[9]);
      ent->name = name + "_model10";
    }
-    if (models[10]) {
+    if (models[10].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[10]);
      ent->name = name + "_model11";
    }
-    if (models[11]) {
+    if (models[11].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[11]);
      ent->name = name + "_model12";
    }
-    if (models[12]) {
+    if (models[12].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[12]);
      ent->name = name + "_model13";
    }
-    if (models[13]) {
+    if (models[13].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(models[13]);
      ent->name = name + "_model14";
    }
-    if (particles1[0]) {
+    if (particles1[0].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particles1[0]);
      ent->name = name + "_part1";
    }
-    if (particles1[1]) {
+    if (particles1[1].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particles1[1]);
      ent->name = name + "_part2";
    }
-    if (particles1[2]) {
+    if (particles1[2].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particles1[2]);
      ent->name = name + "_part3";
    }
-    if (stateMachine) {
+    if (stateMachine.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(stateMachine);
      ent->name = name + "_fsm";
    }
-    if (particles2[0]) {
+    if (particles2[0].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particles2[0]);
      ent->name = name + "_part4";
    }
-    if (particles2[1]) {
+    if (particles2[1].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particles2[1]);
      ent->name = name + "_part5";
    }
-    if (particles2[2]) {
+    if (particles2[2].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particles2[2]);
      ent->name = name + "_part6";
    }
-    if (particles2[3]) {
+    if (particles2[3].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particles2[3]);
      ent->name = name + "_part7";
    }
-    if (particles2[4]) {
+    if (particles2[4].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particles2[4]);
      ent->name = name + "_part8";
    }
-    if (particles2[5]) {
+    if (particles2[5].isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particles2[5]);
      ent->name = name + "_part9";
    }
-    if (particle) {
+    if (particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
      ent->name = name + "_part10";
    }
-    if (texture) {
+    if (texture.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(texture);
      ent->name = name + "_texture";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/ThardusRockProjectile.hpp
@@ -25,11 +25,11 @@ struct ThardusRockProjectile : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (model) {
+    if (model.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model);
      ent->name = name + "_model";
    }
-    if (stateMachine) {
+    if (stateMachine.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(stateMachine);
      ent->name = name + "_fsm";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/VisorGoo.hpp
@@ -21,11 +21,11 @@ struct VisorGoo : IScriptObject {
  Value<bool> skipAngleTest;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (particle) {
+    if (particle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(particle);
      ent->name = name + "_part";
    }
-    if (electric) {
+    if (electric.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(electric);
      ent->name = name + "_elsc";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/WallCrawlerSwarm.hpp
@@ -53,19 +53,19 @@ struct WallCrawlerSwarm : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (part1) {
+    if (part1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(part1);
      ent->name = name + "_part1";
    }
-    if (part2) {
+    if (part2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(part2);
      ent->name = name + "_part2";
    }
-    if (part3) {
+    if (part3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(part3);
      ent->name = name + "_part3";
    }
-    if (part4) {
+    if (part4.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(part4);
      ent->name = name + "_part4";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Warwasp.hpp
@@ -27,11 +27,11 @@ struct Warwasp : IScriptObject {
  }

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (projectileWeapon) {
+    if (projectileWeapon.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(projectileWeapon);
      ent->name = name + "_wpsc";
    }
-    if (projectileVisorParticle) {
+    if (projectileVisorParticle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(projectileVisorParticle);
      ent->name = name + "_part";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/Water.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/Water.hpp
@@ -89,51 +89,51 @@ struct Water : IScriptObject {
  struct UnusedBitset : BigDNA{AT_DECL_EXPLICIT_DNA} unusedBitset;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (patternMap1) {
+    if (patternMap1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(patternMap1);
      ent->name = name + "_patternMap1";
    }
-    if (patternMap2) {
+    if (patternMap2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(patternMap2);
      ent->name = name + "_patternMap2";
    }
-    if (colorMap) {
+    if (colorMap.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(colorMap);
      ent->name = name + "_colorMap";
    }
-    if (bumpMap) {
+    if (bumpMap.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(bumpMap);
      ent->name = name + "_bumpMap";
    }
-    if (envMap) {
+    if (envMap.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(envMap);
      ent->name = name + "_envMap";
    }
-    if (envBumpMap) {
+    if (envBumpMap.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(envBumpMap);
      ent->name = name + "_envBumpMap";
    }
-    if (lightmap) {
+    if (lightmap.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(lightmap);
      ent->name = name + "_lightmap";
    }
-    if (splashParticle1) {
+    if (splashParticle1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(splashParticle1);
      ent->name = name + "_splashParticle1";
    }
-    if (splashParticle2) {
+    if (splashParticle2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(splashParticle2);
      ent->name = name + "_splashParticle2";
    }
-    if (splashParticle3) {
+    if (splashParticle3.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(splashParticle3);
      ent->name = name + "_splashParticle3";
    }
-    if (visorRunoffParticle) {
+    if (visorRunoffParticle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(visorRunoffParticle);
      ent->name = name + "_visorRunoffParticle";
    }
-    if (unmorphVisorRunoffParticle) {
+    if (unmorphVisorRunoffParticle.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(unmorphVisorRunoffParticle);
      ent->name = name + "_unmorphVisorRunoffParticle";
    }
--- a/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp
+++ b/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.hpp
@@ -39,15 +39,15 @@ struct WorldTeleporter : IScriptObject {
  Value<float> unknown16;

  void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
-    if (model1) {
+    if (model1.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model1);
      ent->name = name + "_model1";
    }
-    if (model2) {
+    if (model2.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model2);
      ent->name = name + "_model2";
    }
-    if (strg) {
+    if (strg.isValid()) {
      PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(strg);
      ent->name = name + "_strg";
    }