v1.0.4.0

ividyon · May 21, 2023 · e2dcd82 · e2dcd82
1 parent f78f79f
commit e2dcd82
Show file tree

Hide file tree

Showing 21 changed files with 956 additions and 1,062 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+    <PropertyGroup>
+        <Authors>ividyon</Authors>
+        <Company>ividyon</Company>
+        <Version>1.0.4.0</Version>
+    </PropertyGroup>
+</Project>
diff --git a/NOTES.md b/NOTES.md
@@ -1 +1,4 @@
-* Fixed regulation.bin repacking as regulation.bin.dcx.
+* New attempt at GPARAM support, using decompiled code from a random YabberAvocado zip. Appears to do a byte-perfect roundtrip unlike all other versions. Testing needed.
+* Project cleanup for less warnings.
+* Moved to NuGet versioning format (1.0.4.0 instead of 1.0.4).
+* Properly display assembly info data.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ New additions include:
 * FXR support
 * MATBIN support (by Avocado)
 * MTD support (by Avocado)
-* ELDEN RING GPARAM support (by Avocado and Pear)
+* ELDEN RING GPARAM support (by Avocado)
 * Console TPF unpacking (but not repacking)
 * Minor fixes like ELDEN RING envmap TPF unpack
 

diff --git a/WitchyBND.DCX/Program.cs b/WitchyBND.DCX/Program.cs
@@ -40,7 +40,6 @@ static void Main(string[] args)
                 if (arg.Contains('*'))
                 {
                     var matcher = new Matcher();
-                    int? idx = null;
                     var rootParts = arg.Split(Path.DirectorySeparatorChar).TakeWhile(part => !part.Contains('*')).ToList();
                     var root = string.Join(Path.DirectorySeparatorChar, rootParts);
                     var rest = arg.Substring(root.Length + 1);

diff --git a/WitchyBND.DCX/WitchyBND.DCX.csproj b/WitchyBND.DCX/WitchyBND.DCX.csproj
@@ -2,9 +2,13 @@
   <PropertyGroup>
     <TargetFramework>net7.0-windows</TargetFramework>
     <OutputType>Exe</OutputType>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <RootNamespace>WitchyBND.DCX</RootNamespace>
-    <Company>ividyon</Company>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <RootNamespace>WitchyBND</RootNamespace>
+    <IsPackable>false</IsPackable>
+    <Title>WitchyBND.DCX</Title>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Assets/icon.ico</ApplicationIcon>

diff --git a/WitchyBND/Formats/WGPARAM.cs b/WitchyBND/Formats/WGPARAM.cs
diff --git a/WitchyBND/Formats/WPARAM.cs b/WitchyBND/Formats/WPARAM.cs
@@ -454,7 +454,7 @@ public static void PopulateParamdef(WBUtil.GameType game)
                 {
                     var patchParamdefPath = $@"{patchPath}\{Path.GetFileName(path)}";
                     if (!File.Exists(patchParamdefPath)) continue;
-                    PARAMDEF? patchParamdef = PARAMDEF.XmlDeserialize(patchParamdefPath);
+                    var patchParamdef = PARAMDEF.XmlDeserialize(patchParamdefPath);
                     if (patchParamdef == null) continue;
                     paramdef = patchParamdef;
                     break;

diff --git a/WitchyBND/Program.cs b/WitchyBND/Program.cs
@@ -57,7 +57,6 @@ static void Main(string[] args)
                 if (arg.Contains('*'))
                 {
                     var matcher = new Matcher();
-                    int? idx = null;
                     var rootParts = arg.Split(Path.DirectorySeparatorChar).TakeWhile(part => !part.Contains('*')).ToList();
                     var root = string.Join(Path.DirectorySeparatorChar, rootParts);
                     var rest = arg.Substring(root.Length + 1);

diff --git a/WitchyBND/WitchyBND.csproj b/WitchyBND/WitchyBND.csproj
@@ -2,12 +2,10 @@
   <PropertyGroup>
     <TargetFramework>net7.0-windows</TargetFramework>
     <OutputType>Exe</OutputType>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <RootNamespace>WitchyBND</RootNamespace>
-    <Company>ividyon</Company>
     <IsPackable>false</IsPackable>
-    <Title>WitchyBND</Title>
-    <Authors>ividyon</Authors>
+    <Title>WitchyBND</Title>    
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <OutputPath>bin\x64\Debug\</OutputPath>
@@ -28,6 +26,9 @@
     <DebugType>embedded</DebugType>
     <OutputPath>..\bin\Release\</OutputPath>
   </PropertyGroup>
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.2.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
@@ -53,5 +54,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Remove="SoulsFormats.dll" />
+    <None Remove="Yabber.dll" />
   </ItemGroup>
 </Project>
diff --git a/WitchyFormats/Formats/Fxr3.cs b/WitchyFormats/Formats/Fxr3.cs
@@ -1,4 +1,7 @@
-using System.Xml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml;
 using System.Xml.Linq;
 using System.Xml.Serialization;
 using SoulsFormats;