Added rel/rso module dependencies to the script template format

src/Core/GameProject/CDependencyTree.cpp

@@ -1,4 +1,5 @@
 #include "CDependencyTree.h"
+#include "Core/Resource/Script/CMasterTemplate.h"
 #include "Core/Resource/Script/CScriptLayer.h"
 #include "Core/Resource/Script/CScriptObject.h"
 
@@ -370,3 +371,57 @@ CScriptInstanceDependencyTree* CAreaDependencyTree::ScriptInstanceByIndex(u32 In
     ASSERT(Index >= 0 && Index < mScriptInstances.size());
     return mScriptInstances[Index];
 }
+
+void CAreaDependencyTree::GetModuleDependencies(EGame Game, std::vector<TString>& rModuleDepsOut, std::vector<u32>& rModuleLayerOffsetsOut) const
+{
+    CMasterTemplate *pMaster = CMasterTemplate::MasterForGame(Game);
+
+    // Output module list will be split per-script layer
+    // The output offset list contains two offsets per layer - start index and end index
+    for (u32 iLayer = 0; iLayer < mLayerOffsets.size(); iLayer++)
+    {
+        u32 StartIdx = mLayerOffsets[iLayer];
+        u32 EndIdx = (iLayer == mLayerOffsets.size() - 1 ? mScriptInstances.size() : mLayerOffsets[iLayer + 1]);
+
+        u32 ModuleStartIdx = rModuleDepsOut.size();
+        rModuleLayerOffsetsOut.push_back(ModuleStartIdx);
+
+        // Keep track of which types we've already checked on this layer to speed things up a little...
+        std::set<u32> UsedObjectTypes;
+
+        for (u32 iInst = StartIdx; iInst < EndIdx; iInst++)
+        {
+            CScriptInstanceDependencyTree *pInst = mScriptInstances[iInst];
+            u32 ObjType = pInst->ObjectType();
+
+            if (UsedObjectTypes.find(ObjType) == UsedObjectTypes.end())
+            {
+                // Get the module list for this object type and check whether any of them are new before adding them to the output list
+                CScriptTemplate *pTemplate = pMaster->TemplateByID(ObjType);
+                const std::vector<TString>& rkModules = pTemplate->RequiredModules();
+
+                for (u32 iMod = 0; iMod < rkModules.size(); iMod++)
+                {
+                    TString ModuleName = rkModules[iMod];
+                    bool NewModule = true;
+
+                    for (u32 iUsed = ModuleStartIdx; iUsed < rModuleDepsOut.size(); iUsed++)
+                    {
+                        if (rModuleDepsOut[iUsed] == ModuleName)
+                        {
+                            NewModule = false;
+                            break;
+                        }
+                    }
+
+                    if (NewModule)
+                        rModuleDepsOut.push_back(ModuleName);
+                }
+
+                UsedObjectTypes.insert(ObjType);
+            }
+        }
+
+        rModuleLayerOffsetsOut.push_back(rModuleDepsOut.size());
+    }
+}

src/Core/GameProject/CDependencyTree.h

@@ -162,6 +162,7 @@ public:
 
     void AddScriptLayer(CScriptLayer *pLayer);
     CScriptInstanceDependencyTree* ScriptInstanceByIndex(u32 Index) const;
+    void GetModuleDependencies(EGame Game, std::vector<TString>& rModuleDepsOut, std::vector<u32>& rModuleLayerOffsetsOut) const;
 
     // Accessors
     inline u32 NumScriptLayers() const                  { return mLayerOffsets.size(); }

src/Core/Resource/Cooker/CTemplateWriter.cpp

@@ -244,6 +244,20 @@ void CTemplateWriter::SaveScriptTemplate(CScriptTemplate *pTemp)
     pName->SetText(*pTemp->Name());
     pRoot->LinkEndChild(pName);
 
+    // Write modules
+    if (!pTemp->mModules.empty())
+    {
+        XMLElement *pModules = ScriptXML.NewElement("modules");
+        pRoot->LinkEndChild(pModules);
+
+        for (u32 iMod = 0; iMod < pTemp->mModules.size(); iMod++)
+        {
+            XMLElement *pModule = ScriptXML.NewElement("module");
+            pModule->SetText(*pTemp->mModules[iMod]);
+            pModules->LinkEndChild(pModule);
+        }
+    }
+
     // Write properties
     SaveProperties(&ScriptXML, pRoot, pTemp->mpBaseStruct);
 

src/Core/Resource/Factory/CTemplateLoader.cpp

@@ -427,6 +427,20 @@ CScriptTemplate* CTemplateLoader::LoadScriptTemplate(XMLDocument *pDoc, const TS
         pScript->mpBaseStruct->SetName(pScript->mTemplateName);
     }
 
+    // Modules
+    XMLElement *pModulesElem = pRoot->FirstChildElement("modules");
+
+    if (pModulesElem)
+    {
+        XMLElement *pModuleElem = pModulesElem->FirstChildElement("module");
+
+        while (pModuleElem)
+        {
+            pScript->mModules.push_back(pModuleElem->GetText());
+            pModuleElem = pModuleElem->NextSiblingElement("module");
+        }
+    }
+
     // Properties
     XMLElement *pPropsElem = pRoot->FirstChildElement("properties");
 

src/Core/Resource/Script/CScriptTemplate.h

@@ -68,6 +68,7 @@ private:
     CStructTemplate *mpBaseStruct;
     std::list<CScriptObject*> mObjectList;
     TString mTemplateName;
+    std::vector<TString> mModules;
     TString mSourceFile;
     u32 mObjectID;
     bool mVisible;
@@ -127,6 +128,7 @@ public:
     inline CStructTemplate* BaseStruct() const              { return mpBaseStruct; }
     inline u32 NumAttachments() const                       { return mAttachments.size(); }
     const SAttachment& Attachment(u32 Index) const          { return mAttachments[Index]; }
+    const std::vector<TString>& RequiredModules() const     { return mModules; }
 
     inline bool HasName() const             { return !mNameIDString.IsEmpty(); }
     inline bool HasPosition() const         { return !mPositionIDString.IsEmpty(); }

templates/dkcr/Script/BirdBoss.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>BirdBoss</name>
+    <modules>
+        <module>RSO_BirdBoss.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/Cable.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Cable</name>
+    <modules>
+        <module>RSO_ScriptCable.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0x7E397FED" template="Structs/ActorParameters.xml"/>

templates/dkcr/Script/ForestBoss.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>ForestBoss</name>
+    <modules>
+        <module>RSO_ForestBoss.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/JungleBoss1.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>JungleBoss1</name>
+    <modules>
+        <module>RSO_UglyBros.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/LODController.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>LODController</name>
+    <modules>
+        <module>RSO_ScriptLODController.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0x00B17E5F" type="long">

templates/dkcr/Script/Mole.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Mole</name>
+    <modules>
+        <module>RSO_MoleTrain.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0x7E397FED" template="Structs/ActorParameters.xml"/>

templates/dkcr/Script/MoleCart.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>MoleCart</name>
+    <modules>
+        <module>RSO_MoleTrain.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/MoleTrainManager.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>MoleTrainManager</name>
+    <modules>
+        <module>RSO_MoleTrain.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/MultiModelActor.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>MultiModelActor</name>
+    <modules>
+        <module>RSO_ScriptMultiModelActor.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xF344C0B0" type="vector3f">

templates/dkcr/Script/OceanBridge.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>OceanBridge</name>
+    <modules>
+        <module>RSO_OceanBridge.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xC27FFA8F" type="file" extensions="CMDL"/>

templates/dkcr/Script/PilotChicken.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>PilotChicken</name>
+    <modules>
+        <module>RSO_RobotChicken.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/PirateCrab.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>PirateCrab</name>
+    <modules>
+        <module>RSO_PirateCrab.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/PirateCrabManager.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>PirateCrabManager</name>
+    <modules>
+        <module>RSO_PirateCrab.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0x5ECB9A6B" type="multi">

templates/dkcr/Script/RobotChicken.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>RobotChicken</name>
+    <modules>
+        <module>RSO_RobotChicken.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/RobotChickenFlyer.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>RobotChickenFlyer</name>
+    <modules>
+        <module>RSO_RobotChicken.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/SplinePathNetwork.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>SplinePathNetwork</name>
+    <modules>
+        <module>RSO_ForestBoss.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
     </properties>

templates/dkcr/Script/TrainSequence.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>TrainSequence</name>
+    <modules>
+        <module>RSO_MoleTrain.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/TrainTrackManager.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>TrainTrackManager</name>
+    <modules>
+        <module>RSO_MoleTrain.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Script/VolcanoBossBodyPart.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>VolcanoBossBodyPart</name>
+    <modules>
+        <module>RSO_VolcanoBoss.rso</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/dkcr/Structs/LightParameters.xml

@@ -5,7 +5,7 @@
             <default>1.0, 1.0, 1.0, 1.0</default>
         </property>
         <enum ID="0x6B5E7509">
-            <default>0x01</default>
+            <default>0x00000001</default>
             <enumerators>
                 <enumerator ID="0x00" name="Unknown 1"/>
                 <enumerator ID="0x01" name="Normal World Lighting"/>

templates/mp1/Enums/PlayerAction.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <enum name="PlayerAction">
     <enumerators>
         <enumerator ID="0x00" name="Forward"/>

templates/mp2/MasterTemplate.xml

@@ -112,7 +112,7 @@
         <object ID="PARA" template="Script/Parasite.xml"/>
         <object ID="PCAM" template="Script/PathCamera.xml"/>
         <object ID="PCKP" template="Script/Pickup.xml"/>
-        <object ID="PILB" template="Script/Pillbug.xml"/>
+        <object ID="PILB" template="Script/PillBug.xml"/>
         <object ID="PIRT" template="Script/SpacePirate.xml"/>
         <object ID="PKGN" template="Script/PickupGenerator.xml"/>
         <object ID="PLAC" template="Script/PlayerActor.xml"/>

templates/mp2/Script/AIMannedTurret.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>AIMannedTurret</name>
+    <modules>
+        <module>AIMannedTurret.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/mp2/Script/Actor.xml

@@ -56,9 +56,9 @@
         <property ID="0xEF485DB9" type="file" extensions="WPSC"/>
         <struct ID="0x553B1339" template="Structs/DamageInfo.xml">
             <properties>
-                <property ID="0x119FBD31">
+                <enum ID="0x119FBD31">
-                    <default>11</default>
+                    <default>0x0000000B</default>
-                </property>
+                </enum>
             </properties>
         </struct>
     </properties>

templates/mp2/Script/AmbientAI.xml

@@ -17,58 +17,58 @@
             <properties>
                 <struct ID="0xAC8BB2A7">
                     <properties>
-                        <property ID="0x68ACBD86">
+                        <enum ID="0x68ACBD86">
                             <cook_pref>never</cook_pref>
-                        </property>
+                        </enum>
                     </properties>
                 </struct>
                 <struct ID="0xD99C0400">
                     <properties>
-                        <property ID="0x68ACBD86">
+                        <enum ID="0x68ACBD86">
                             <cook_pref>never</cook_pref>
-                        </property>
+                        </enum>
                     </properties>
                 </struct>
                 <struct ID="0x68AE13A0">
                     <properties>
-                        <property ID="0x68ACBD86">
+                        <enum ID="0x68ACBD86">
                             <cook_pref>never</cook_pref>
-                        </property>
+                        </enum>
                     </properties>
                 </struct>
                 <struct ID="0xF0B2F4CF">
                     <properties>
-                        <property ID="0x68ACBD86">
+                        <enum ID="0x68ACBD86">
                             <cook_pref>never</cook_pref>
-                        </property>
+                        </enum>
                     </properties>
                 </struct>
                 <struct ID="0x00EFE8CB">
                     <properties>
-                        <property ID="0x68ACBD86">
+                        <enum ID="0x68ACBD86">
                             <cook_pref>never</cook_pref>
-                        </property>
+                        </enum>
                     </properties>
                 </struct>
                 <struct ID="0xBB70093F">
                     <properties>
-                        <property ID="0x68ACBD86">
+                        <enum ID="0x68ACBD86">
                             <cook_pref>never</cook_pref>
-                        </property>
+                        </enum>
                     </properties>
                 </struct>
                 <struct ID="0xA442B4A3">
                     <properties>
-                        <property ID="0x68ACBD86">
+                        <enum ID="0x68ACBD86">
                             <cook_pref>never</cook_pref>
-                        </property>
+                        </enum>
                     </properties>
                 </struct>
                 <struct ID="0x6924B8C1">
                     <properties>
-                        <property ID="0x68ACBD86">
+                        <enum ID="0x68ACBD86">
                             <cook_pref>never</cook_pref>
-                        </property>
+                        </enum>
                     </properties>
                 </struct>
             </properties>

templates/mp2/Script/AreaAttributes.xml

@@ -18,7 +18,7 @@
             <description>Enable Dark World damage and switch to the Dark World map.</description>
         </property>
         <enum ID="0x9D0006AB">
-            <default>0x00</default>
+            <default>0x00000000</default>
             <enumerators>
                 <enumerator ID="0x00" name="None"/>
                 <enumerator ID="0x01" name="Snow"/>

templates/mp2/Script/AtomicAlpha.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>AtomicAlpha</name>
+    <modules>
+        <module>AtomicAlpha.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">
@@ -28,9 +31,9 @@
                 </property>
                 <struct ID="0xD756416E">
                     <properties>
-                        <property ID="0x119FBD31">
+                        <enum ID="0x119FBD31">
-                            <default>9</default>
+                            <default>0x00000009</default>
-                        </property>
+                        </enum>
                         <property ID="0xF2D02613">
                             <default>10.0</default>
                         </property>

templates/mp2/Script/AtomicBeta.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>AtomicBeta</name>
+    <modules>
+        <module>AtomicBeta.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/BacteriaSwarm.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>BacteriaSwarm</name>
+    <modules>
+        <module>BacteriaSwarm.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0x7E397FED" template="Structs/ActorParameters.xml"/>

templates/mp2/Script/Blogg.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Blogg</name>
+    <modules>
+        <module>Blogg.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/Brizgee.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Brizgee</name>
+    <modules>
+        <module>WallCrawler.rel</module>
+        <module>Parasite.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml"/>

templates/mp2/Script/CameraFilterKeyframe.xml

@@ -7,7 +7,7 @@
             <default>0</default>
         </property>
         <enum ID="0x6A3E9A3D">
-            <default>0</default>
+            <default>0x00000000</default>
             <enumerators>
                 <enumerator ID="0x00" name="FullScreen"/>
                 <enumerator ID="0x01" name="FullScreenHalvesLeftRight"/>

templates/mp2/Script/CannonBall.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>CannonBall</name>
+    <modules>
+        <module>ScriptCannonBall.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xB68C6D96" type="file" extensions="PART"/>

templates/mp2/Script/ChozoGhost.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>ChozoGhost</name>
+    <modules>
+        <module>ChozoGhost.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/Coin.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Coin</name>
+    <modules>
+        <module>ScriptCoin.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/mp2/Script/CommandoPirate.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>CommandoPirate</name>
+    <modules>
+        <module>PirateRagDoll.rel</module>
+        <module>CommandoPirate.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/ConditionalRelay.xml

@@ -12,23 +12,23 @@
         <struct ID="0xCEC16932" template="Structs/ConditionalTest.xml"/>
         <struct ID="0xE709DDC0" template="Structs/ConditionalTest.xml">
             <properties>
-                <property ID="0xDE3E40A3">
+                <enum ID="0xDE3E40A3">
-                    <default>0</default>
+                    <default>0x00000000</default>
-                </property>
+                </enum>
             </properties>
         </struct>
         <struct ID="0x49614C51" template="Structs/ConditionalTest.xml">
             <properties>
-                <property ID="0xDE3E40A3">
+                <enum ID="0xDE3E40A3">
-                    <default>0</default>
+                    <default>0x00000000</default>
-                </property>
+                </enum>
             </properties>
         </struct>
         <struct ID="0xB498B424" template="Structs/ConditionalTest.xml">
             <properties>
-                <property ID="0xDE3E40A3">
+                <enum ID="0xDE3E40A3">
-                    <default>0</default>
+                    <default>0x00000000</default>
-                </property>
+                </enum>
             </properties>
         </struct>
     </properties>

templates/mp2/Script/Crystallite.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Crystallite</name>
+    <modules>
+        <module>WallCrawler.rel</module>
+        <module>Parasite.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml"/>

templates/mp2/Script/DarkCommando.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>DarkCommando</name>
+    <modules>
+        <module>PirateRagDoll.rel</module>
+        <module>DarkCommando.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/DarkSamus.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>DarkSamus</name>
+    <modules>
+        <module>DarkSamus.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/DarkSamusBattleStage.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>DarkSamusBattleStage</name>
+    <modules>
+        <module>DarkSamusBattleStage.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/mp2/Script/DarkTrooper.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>DarkTrooper</name>
+    <modules>
+        <module>PirateRagDoll.rel</module>
+        <module>DarkTrooper.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/DestructibleBarrier.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>DestructibleBarrier</name>
+    <modules>
+        <module>DestructibleBarrier.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xCD4F7E71" type="long">

templates/mp2/Script/DigitalGuardian.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>DigitalGuardian</name>
+    <modules>
+        <module>DigitalGuardian.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/DigitalGuardianHead.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>DigitalGuardianHead</name>
+    <modules>
+        <module>DigitalGuardian.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/ElitePirate.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>ElitePirate</name>
+    <modules>
+        <module>ElitePirate.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/EmperorIngStage1.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>EmperorIngStage1</name>
+    <modules>
+        <module>EmperorIngStage1.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/EmperorIngStage2Tentacle.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>EmperorIngStage2Tentacle</name>
+    <modules>
+        <module>EmperorIngStage2Tentacle.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/EmperorIngStage3.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>EmperorIngStage3</name>
+    <modules>
+        <module>EmperorIngStage3.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/EyeBall.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>EyeBall</name>
+    <modules>
+        <module>EyeBall.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml"/>

templates/mp2/Script/FishCloud.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>FishCloud</name>
+    <modules>
+        <module>FishCloud.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xC6BB2F45" type="bool">

templates/mp2/Script/FishCloudModifier.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>FishCloudModifier</name>
+    <modules>
+        <module>FishCloud.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xC6BB2F45" type="bool">

templates/mp2/Script/FlyerSwarm.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>FlyerSwarm</name>
+    <modules>
+        <module>SwarmBasics.rel</module>
+        <module>FlyerSwarm.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0x7E397FED" template="Structs/ActorParameters.xml"/>

templates/mp2/Script/FlyingPirate.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>FlyingPirate</name>
+    <modules>
+        <module>FlyingPirate.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/FogOverlay.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>FogOverlay</name>
+    <modules>
+        <module>FogOverlay.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0x547B28D5" type="float">

templates/mp2/Script/ForgottenObject.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>ForgottenObject</name>
+    <modules>
+        <module>ForgottenObject.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
     </properties>

templates/mp2/Script/FrontEndDataNetwork.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>FrontEndDataNetwork</name>
+    <modules>
+        <module>ScriptFrontEndDataNetwork.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0x5C3C9E4A" type="bool">

templates/mp2/Script/Glowbug.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Glowbug</name>
+    <modules>
+        <module>Glowbug.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml"/>

templates/mp2/Script/Grenchler.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Grenchler</name>
+    <modules>
+        <module>Grenchler.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/GuiMenu.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>GuiMenu</name>
+    <modules>
+        <module>ScriptGui.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/mp2/Script/GuiPlayerJoinManager.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>GuiPlayerJoinManager</name>
+    <modules>
+        <module>ScriptGui.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/mp2/Script/GuiScreen.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>GuiScreen</name>
+    <modules>
+        <module>ScriptGui.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xD3B7E6D8" type="long">

templates/mp2/Script/GuiSlider.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>GuiSlider</name>
+    <modules>
+        <module>ScriptGui.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/mp2/Script/GuiWidget.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>GuiWidget</name>
+    <modules>
+        <module>ScriptGui.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/mp2/Script/GunTurretBase.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>GunTurretBase</name>
+    <modules>
+        <module>GunTurret.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0x66DCAACB" template="Structs/DamageInfo.xml">

templates/mp2/Script/GunTurretTop.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>GunTurretTop</name>
+    <modules>
+        <module>GunTurret.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0x3BC1D043" type="float">

templates/mp2/Script/Ing.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Ing</name>
+    <modules>
+        <module>GeomBlobV2.rel</module>
+        <module>Ing.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/IngBlobSwarm.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>IngBlobSwarm</name>
+    <modules>
+        <module>SwarmBasics.rel</module>
+        <module>IngBlobSwarm.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0x7E397FED" template="Structs/ActorParameters.xml"/>

templates/mp2/Script/IngBoostBallGuardian.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>IngBoostBallGuardian</name>
+    <modules>
+        <module>GeomBlobV2.rel</module>
+        <module>Ing.rel</module>
+        <module>IngBoostBallGuardian.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/IngPuddle.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>IngPuddle</name>
+    <modules>
+        <module>GeomBlobV2.rel</module>
+        <module>Ing.rel</module>
+        <module>IngPuddle.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0x7E397FED" template="Structs/ActorParameters.xml"/>

templates/mp2/Script/IngSnatchingSwarm.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>IngSnatchingSwarm</name>
+    <modules>
+        <module>IngSnatchingSwarm.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0x55744160" type="file" extensions="AFSM"/>

templates/mp2/Script/IngSpaceJumpGuardian.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>IngSpaceJumpGuardian</name>
+    <modules>
+        <module>GeomBlobV2.rel</module>
+        <module>Ing.rel</module>
+        <module>IngSpaceJumpGuardian.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/IngSpiderballGuardian.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>IngSpiderballGuardian</name>
+    <modules>
+        <module>IngSpiderballGuardian.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">
@@ -37,9 +40,9 @@
                 </property>
                 <struct ID="0xBA78D281" template="Structs/DamageInfo.xml">
                     <properties>
-                        <property ID="0x119FBD31">
+                        <enum ID="0x119FBD31">
-                            <default>11</default>
+                            <default>0x0000000B</default>
-                        </property>
+                        </enum>
                         <property ID="0xF2D02613">
                             <default>40.0</default>
                         </property>

templates/mp2/Script/Kralee.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Kralee</name>
+    <modules>
+        <module>WallCrawler.rel</module>
+        <module>Kralee.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xBE73724A" type="long">

templates/mp2/Script/Krocuss.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Krocuss</name>
+    <modules>
+        <module>WallCrawler.rel</module>
+        <module>Krocuss.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xBE73724A" type="long">

templates/mp2/Script/Lumite.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Lumite</name>
+    <modules>
+        <module>Lumite.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/MediumIng.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>MediumIng</name>
+    <modules>
+        <module>GeomBlobV2.rel</module>
+        <module>MediumIng.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/Metaree.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Metaree</name>
+    <modules>
+        <module>Metaree.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">
@@ -13,9 +16,9 @@
                 </property>
                 <struct ID="0xD756416E">
                     <properties>
-                        <property ID="0x119FBD31">
+                        <enum ID="0x119FBD31">
-                            <default>11</default>
+                            <default>0x0000000B</default>
-                        </property>
+                        </enum>
                         <property ID="0xF2D02613">
                             <default>2.5</default>
                         </property>
@@ -39,9 +42,9 @@
         <struct ID="0x7E397FED" template="Structs/ActorParameters.xml"/>
         <struct ID="0x086D58DD" template="Structs/DamageInfo.xml">
             <properties>
-                <property ID="0x119FBD31">
+                <enum ID="0x119FBD31">
-                    <default>11</default>
+                    <default>0x0000000B</default>
-                </property>
+                </enum>
                 <property ID="0xF2D02613">
                     <default>5.0</default>
                 </property>

templates/mp2/Script/MetareeSwarm.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>MetareeSwarm</name>
+    <modules>
+        <module>SwarmBasics.rel</module>
+        <module>MetareeSwarm.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0x7E397FED" template="Structs/ActorParameters.xml"/>

templates/mp2/Script/MetroidAlpha.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>MetroidAlpha</name>
+    <modules>
+        <module>Metroid.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/MinorIng.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>MinorIng</name>
+    <modules>
+        <module>GeomBlobV2.rel</module>
+        <module>MinorIng.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/MysteryFlyer.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>MysteryFlyer</name>
+    <modules>
+        <module>MysteryFlyer.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml"/>
@@ -10,9 +13,9 @@
                 <property ID="0x51253BA3" type="file" extensions="WPSC"/>
                 <struct ID="0xCEA30138" template="Structs/DamageInfo.xml">
                     <properties>
-                        <property ID="0x119FBD31">
+                        <enum ID="0x119FBD31">
-                            <default>11</default>
+                            <default>0x0000000B</default>
-                        </property>
+                        </enum>
                         <property ID="0xF2D02613">
                             <default>5.0</default>
                         </property>

templates/mp2/Script/OctapedeSegment.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>OctapedeSegment</name>
+    <modules>
+        <module>WallCrawler.rel</module>
+        <module>OctapedeSegment.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xBE73724A" type="long">

templates/mp2/Script/Parasite.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Parasite</name>
+    <modules>
+        <module>WallCrawler.rel</module>
+        <module>Parasite.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xBE73724A" type="long">
@@ -34,9 +38,9 @@
                 </property>
                 <struct ID="0xD756416E">
                     <properties>
-                        <property ID="0x119FBD31">
+                        <enum ID="0x119FBD31">
-                            <default>9</default>
+                            <default>0x00000009</default>
-                        </property>
+                        </enum>
                         <property ID="0xF2D02613">
                             <default>10.0</default>
                         </property>

templates/mp2/Script/Pickup.xml

@@ -10,7 +10,7 @@
             <default>0.0, 0.0, 0.0</default>
         </property>
         <enum ID="0xA02EF0C4" template="Enums/Item.xml">
-            <default>0x00</default>
+            <default>0x00000000</default>
         </enum>
         <property ID="0x28C71B54" type="long">
             <default>1</default>

templates/mp2/Script/Pillbug.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
-    <name>Pillbug</name>
+    <name>PillBug</name>
+    <modules>
+        <module>WallCrawler.rel</module>
+        <module>PillBug.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml"/>

templates/mp2/Script/PlantScarabSwarm.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>PlantScarabSwarm</name>
+    <modules>
+        <module>SwarmBasics.rel</module>
+        <module>PlantScarabSwarm.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0x7E397FED" template="Structs/ActorParameters.xml"/>

templates/mp2/Script/PlayerActor.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>PlayerActor</name>
+    <modules>
+        <module>ScriptPlayerActor.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xF344C0B0" type="vector3f">

templates/mp2/Script/PlayerController.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>PlayerController</name>
+    <modules>
+        <module>ScriptPlayerProxy.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml">
             <properties>

templates/mp2/Script/PlayerTurret.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>PlayerTurret</name>
+    <modules>
+        <module>ScriptPlayerTurret.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xEEADEFA6" type="long">

templates/mp2/Script/PuddleSpore.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>PuddleSpore</name>
+    <modules>
+        <module>PuddleSpore.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xBE73724A" type="long">

templates/mp2/Script/Puffer.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Puffer</name>
+    <modules>
+        <module>Puffer.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/Rezbit.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Rezbit</name>
+    <modules>
+        <module>Rezbit.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <struct ID="0xB3774750" template="Structs/PatternedInfo.xml">

templates/mp2/Script/RiftPortal.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>RiftPortal</name>
+    <modules>
+        <module>ScriptRiftPortal.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xC27FFA8F" type="file" extensions="CMDL"/>

templates/mp2/Script/Ripper.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
     <name>Ripper</name>
+    <modules>
+        <module>Ripper.rel</module>
+    </modules>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
         <property ID="0xBE73724A" type="long">