Merge branch 'no-win-sdk'

OpenCAGE · Mar 7, 2023 · 0b89d0d · 0b89d0d
2 parents a4ec063 + a8c9f8d
commit 0b89d0d
Show file tree

Hide file tree

Showing 79 changed files with 5,151 additions and 4,235 deletions.
diff --git a/AlienBML b/AlienBML
diff --git a/CathodeLib/CathodeLib.csproj b/CathodeLib/CathodeLib.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -10,13 +10,21 @@
     <Authors>Matt Filer</Authors>
     <Description>Provides support for parsing and writing common Alien: Isolation formats from the Cathode engine.</Description>
     <Copyright>Matt Filer 2023</Copyright>
-    <Version>0.3.3</Version>
+    <Version>0.4.0</Version>
     <OutputType>Library</OutputType>
-    <AssemblyVersion>0.3.3.0</AssemblyVersion>
-    <FileVersion>0.3.3.0</FileVersion>
+    <AssemblyVersion>0.4.0.0</AssemblyVersion>
+    <FileVersion>0.4.0.0</FileVersion>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>$(DefineConstants)TRACE;CATHODE_FAIL_HARD</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>$(DefineConstants)TRACE</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Remove="CathodeBIN\NewFolder\**" />
     <EmbeddedResource Remove="CathodeBIN\NewFolder\**" />
@@ -28,34 +36,29 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Resources\NodeDBs\cathode_enum_lut.bin" />
     <None Remove="Resources\NodeDBs\cathode_generic_lut.bin" />
     <None Remove="Resources\NodeDBs\cathode_id_map.bin" />
     <None Remove="Resources\NodeDBs\cathode_id_map_DUMP_ONLY.bin" />
-    <None Remove="Resources\NodeDBs\composite_entity_names.bin" />
-    <None Remove="Resources\NodeDBs\composite_paths.bin" />
-    <None Remove="Resources\NodeDBs\entity_parameter_names.bin" />
     <None Remove="Resources\NodeDBs\node_friendly_names.bin" />
   </ItemGroup>
 
   <ItemGroup>
     <Compile Include="..\AlienBML\BML.cs" Link="Scripts\CATHODE\BML.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\NodeDBs\cathode_enum_lut.bin" />
-    <EmbeddedResource Include="Resources\NodeDBs\composite_entity_names.bin" />
-    <EmbeddedResource Include="Resources\NodeDBs\composite_paths.bin" />
-    <EmbeddedResource Include="Resources\NodeDBs\entity_parameter_names.bin" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="PresentationCore">
+      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\PresentationCore.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

diff --git a/CathodeLib/Properties/Resources.Designer.cs b/CathodeLib/Properties/Resources.Designer.cs
diff --git a/CathodeLib/Properties/Resources.resx b/CathodeLib/Properties/Resources.resx
@@ -130,4 +130,7 @@
   <data name="entity_parameter_names" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\NodeDBs\entity_parameter_names.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="sound_names" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sound_names.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
diff --git a/CathodeLib/Resources/sound_names.bin b/CathodeLib/Resources/sound_names.bin
diff --git a/CathodeLib/Scripts/AssetPAKs/AssetPAK.cs b/CathodeLib/Scripts/AssetPAKs/AssetPAK.cs
diff --git a/CathodeLib/Scripts/AssetPAKs/Handlers/MaterialMapping.cs b/CathodeLib/Scripts/AssetPAKs/Handlers/MaterialMapping.cs