BFV & SWS profiles (#301)

CadeEvs · Aug 27, 2023 · 4f1662e · 4f1662e
1 parent ae033f8
commit 4f1662e
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 61 deletions.
diff --git a/FrostyCmd/FrostyCmd.csproj b/FrostyCmd/FrostyCmd.csproj
@@ -179,7 +179,9 @@
     <None Include="Banners\PVZ3.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="Banners\SWS.png" />
+    <None Include="Banners\SWS.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="ThirdParty\libfbxsdk.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/FrostyCmd/ProfileCreator.cs b/FrostyCmd/ProfileCreator.cs
diff --git a/FrostyModSupport/Actions/ManifestBundle.cs b/FrostyModSupport/Actions/ManifestBundle.cs
@@ -320,7 +320,10 @@ public ManifestBundleAction(List<ModBundleInfo> bundles, FrostyModExecutor paren
 
                             long startPos = writer.Position;
 
-                            writer.Write(0x9D798ED5, Endian.Big);
+                            if (ProfilesLibrary.DataVersion != (int)ProfileVersion.Battlefield5) //bfv changed the bundle magic for some reason
+                                writer.Write(0x9D798ED5, Endian.Big);
+                            else
+                                writer.Write(0x8C6E84DD, Endian.Big);
                             writer.Write(bundleObj.GetValue<DbObject>("ebx").Count + bundleObj.GetValue<DbObject>("res").Count + bundleObj.GetValue<DbObject>("chunks").Count, Endian.Big);
                             writer.Write(bundleObj.GetValue<DbObject>("ebx").Count, Endian.Big);
                             writer.Write(bundleObj.GetValue<DbObject>("res").Count, Endian.Big);

diff --git a/FrostyModSupport/FrostyModExecutor.cs b/FrostyModSupport/FrostyModExecutor.cs
@@ -1967,7 +1967,14 @@ private void WriteArchiveData(string catalog, CasDataEntry casDataEntry)
                         casEntry.FileInfo.size = info.Data.Length;
                     }
 
-                    casEntry.FileInfo.file = new ManifestFileRef(casEntry.FileInfo.file.CatalogIndex, true, casIndex);
+                    if (ProfilesLibrary.DataVersion == (int)ProfileVersion.Battlefield5)
+                    {
+                        casEntry.FileInfo.file = new ManifestFileRef(casEntry.FileInfo.file.CatalogIndex, false, casIndex);
+                    }
+                    else
+                    {
+                        casEntry.FileInfo.file = new ManifestFileRef(casEntry.FileInfo.file.CatalogIndex, true, casIndex);
+                    }
                 }
 
                 currentCasStream.Write(info.Data, 0, info.Data.Length);

diff --git a/FrostyPlugin/Shaders.bin b/FrostyPlugin/Shaders.bin
diff --git a/FrostySdk/FrostySdk.csproj b/FrostySdk/FrostySdk.csproj
@@ -207,6 +207,9 @@
     <Content Include="Profiles\StarWarsSDK.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Profiles\SWSSDK.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FrostyHash\FrostyHash.vcxproj">

diff --git a/FrostySdk/Profiles.bin b/FrostySdk/Profiles.bin
diff --git a/FrostySdk/Profiles/SWSSDK.dll b/FrostySdk/Profiles/SWSSDK.dll
diff --git a/Plugins/MeshSetPlugin/FrostyMeshSetEditor.cs b/Plugins/MeshSetPlugin/FrostyMeshSetEditor.cs
@@ -834,7 +834,7 @@ private void FBXCreateSkin(FbxScene scene, MeshSetSection section, FbxNode actor
                     if (boneWeights[j] > 0.0f)
                     {
                         int subIndex = boneIndices[j];
-                        if (ProfilesLibrary.DataVersion != (int)ProfileVersion.Battlefield5 && ProfilesLibrary.DataVersion != (int)ProfileVersion.StarWarsBattlefrontII && ProfilesLibrary.DataVersion != (int)ProfileVersion.PlantsVsZombiesBattleforNeighborville || ProfilesLibrary.DataVersion == (int)ProfileVersion.StarWarsSquadrons)
+                        if (ProfilesLibrary.DataVersion != (int)ProfileVersion.Battlefield5 && ProfilesLibrary.DataVersion != (int)ProfileVersion.StarWarsBattlefrontII && ProfilesLibrary.DataVersion != (int)ProfileVersion.PlantsVsZombiesBattleforNeighborville || ProfilesLibrary.DataVersion != (int)ProfileVersion.StarWarsSquadrons)
                             subIndex = boneList[subIndex];
 
                         // account for proc bones