Fixed log spam while exporting MP3 + fixed world asset name being generated incorrectly

src/Core/GameProject/AssetNameGeneration.cpp

@@ -80,7 +80,7 @@ void GenerateAssetNames(CGameProject *pProj)
     {
         // Set world name
         CWorld *pWorld = (CWorld*) It->Load();
-        TWideString WorldName = L'!' + pWorld->Name().ToUTF16() + L"_Master";
+        TWideString WorldName = pWorld->Name().ToUTF16();
         TWideString WorldDir = kWorldsRoot + WorldName + L'\\';
 
         TWideString WorldMasterName = L"!" + WorldName + L"_Master";
@@ -405,7 +405,7 @@ void GenerateAssetNames(CGameProject *pProj)
 
                 if (pAnimDataEntry)
                 {
-                    TWideString AnimDataName = TString::Format(L"%s_animdata", *CharName);
+                    TWideString AnimDataName = TWideString::Format(L"%s_animdata", *CharName);
                     ApplyGeneratedName(pAnimDataEntry, SetDir, AnimDataName);
                 }
             }

src/Core/Resource/Animation/CAnimationParameters.cpp

@@ -89,7 +89,7 @@ void CAnimationParameters::Write(IOutputStream& rSCLY)
         }
         else
         {
-            rSCLY.WriteLong(0xFFFFFFFF);
+            CAssetID::skInvalidID32.Write(rSCLY);
             rSCLY.WriteLong(0);
             rSCLY.WriteLong(0xFFFFFFFF);
         }
@@ -105,7 +105,7 @@ void CAnimationParameters::Write(IOutputStream& rSCLY)
 
         else
         {
-            rSCLY.WriteLongLong(CAssetID::skInvalidID64.ToLongLong());
+            CAssetID::skInvalidID64.Write(rSCLY);
             rSCLY.WriteLong(0xFFFFFFFF);
         }
     }

src/Core/Resource/Factory/CMaterialLoader.cpp

@@ -358,10 +358,11 @@ CMaterial* CMaterialLoader::ReadCorruptionMaterial()
             pPass->mPassType = mpFile->ReadLong();
             pPass->mSettings = (CMaterialPass::EPassSettings) mpFile->ReadLong();
 
+            // Skip passes that don't have a texture. Honestly don't really know what to do with these right now
             u64 TextureID = mpFile->ReadLongLong();
             if (TextureID == 0xFFFFFFFFFFFFFFFF)
             {
-                Log::FileWarning(mpFile->GetSourceString(), mPassOffsets.back(), "Skipping " + pPass->mPassType.ToString() + " pass with no texture");
+                //Log::FileWarning(mpFile->GetSourceString(), mPassOffsets.back(), "Skipping " + pPass->mPassType.ToString() + " pass with no texture");
                 delete pPass;
                 continue;
             }
@@ -555,7 +556,7 @@ void CMaterialLoader::CreateCorruptionPasses(CMaterial *pMat)
             if (mHas0x400) pPass->SetEnabled(false);
         }
 
-        // Bloom
+        // Bloom Incandescence
         else if (Type == "BLOI")
         {
             pPass->SetColorInputs(eZeroRGB, eZeroRGB, eZeroRGB, ePrevRGB);
@@ -570,6 +571,12 @@ void CMaterialLoader::CreateCorruptionPasses(CMaterial *pMat)
             pPass->SetAlphaOutput(ePrevReg);
         }
 
+        // Bloom Diffuse
+        else if (Type == "BLOD")
+        {
+            // Not supported yet
+        }
+
         // X-Ray - since we don't support X-Ray previews, no effect
         else if (Type == "XRAY")
         {
@@ -601,6 +608,7 @@ void CMaterialLoader::CreateCorruptionPasses(CMaterial *pMat)
 
         else
         {
+            //
             Log::FileError(mpFile->GetSourceString(), mPassOffsets[iPass], "Unsupported material pass type: " + Type.ToString());
             pPass->mEnabled = false;
         }

templates/mp3/Script/Effect.xml

@@ -3,7 +3,7 @@
     <name>Effect</name>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
-        <property ID="0x0A479D6F" type="asset" extensions="PART,ELSC,SWHC"/>
+        <property ID="0x0A479D6F" type="asset" extensions="PART,ELSC,SPSC,SWHC"/>
         <property ID="0x3217DFF8" type="bool">
             <default>true</default>
         </property>

templates/mp3/Script/FlyingPirate.xml

@@ -117,7 +117,7 @@
                         <property ID="0xEF485DB9" type="asset" extensions="WPSC"/>
                         <struct ID="0x337F9524" template="Structs/DamageInfo.xml"/>
                         <property ID="0xA55DACF6" type="asset" extensions="CAUD"/>
-                        <property ID="0xE9C8E2BD" type="asset" extensions="PART"/>
+                        <property ID="0xE9C8E2BD" type="asset" extensions="PART,ELSC"/>
                         <property ID="0x86FFB3F6" type="asset" extensions="CAUD"/>
                         <property ID="0xFF77C96F" type="float">
                             <default>50.0</default>
@@ -139,7 +139,7 @@
                         <property ID="0xF0D25256" type="asset" extensions="WPSC"/>
                         <property ID="0x645E8CC5" type="asset" extensions="WPSC"/>
                         <struct ID="0x337F9524" template="Structs/DamageInfo.xml"/>
-                        <property ID="0xE9C8E2BD" type="asset" extensions="PART"/>
+                        <property ID="0xE9C8E2BD" type="asset" extensions="PART,ELSC"/>
                         <property ID="0x86FFB3F6" type="asset" extensions="CAUD"/>
                         <property ID="0x053AE4A7" type="float">
                             <default>10.0</default>

templates/mp3/Script/ShipProxy.xml

@@ -3,6 +3,7 @@
     <name>ShipProxy</name>
     <properties>
         <struct ID="0x255A4580" template="Structs/EditorProperties.xml"/>
+        <property ID="0xA3D63F44" type="character"/>
     </properties>
     <states/>
     <messages/>

templates/mp3/Structs/GandraydaData.xml

@@ -120,7 +120,7 @@
             <properties>
                 <property ID="0x459AE4A8" type="asset" extensions="WPSC"/>
                 <struct ID="0x337F9524" template="Structs/DamageInfo.xml"/>
-                <property ID="0xE9C8E2BD" type="asset" extensions="PART"/>
+                <property ID="0xE9C8E2BD" type="asset" extensions="PART,ELSC"/>
                 <property ID="0x86FFB3F6" type="asset" extensions="CAUD"/>
                 <property ID="0x2F79B3D0" type="float">
                     <default>20.0</default>