From be0c7fd8cb8fabf1d6c2c075c3fcc507d729e474 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sun, 1 Sep 2024 10:34:58 +0100
Subject: [PATCH] Re-enable CVX and update utils

---
 IntelOrca.Biohazard.BioRand/RE2/Re2NpcHelper.cs | 7 +++++--
 biohazard-utils                                 | 2 +-
 biorand/biorand.csproj                          | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IntelOrca.Biohazard.BioRand/RE2/Re2NpcHelper.cs b/IntelOrca.Biohazard.BioRand/RE2/Re2NpcHelper.cs
index ac0c45578..841398488 100644
--- a/IntelOrca.Biohazard.BioRand/RE2/Re2NpcHelper.cs
+++ b/IntelOrca.Biohazard.BioRand/RE2/Re2NpcHelper.cs
@@ -198,10 +198,13 @@ public void CreateEmdFile(byte type, string pldPath, string baseEmdPath, string
                 var zombiePath = fileRepository.GetDataPath("pl0/emd0/em010.emd");
                 var zombie = new EmdFile(BioVersion.Biohazard2, zombiePath);
                 var edd = (Edd1)zombie.GetEdd(1);
-                var offset = edd.Animations[22].Offset;
                 var eddBuilder = edd.ToBuilder();
                 eddBuilder.Animations[0] = eddBuilder.Animations[22];
-                eddBuilder.Animations[0].Frames = eddBuilder.Animations[0].Frames.Take(1).ToArray();
+
+                var firstFrame = eddBuilder.Animations[0].Frames.First();
+                eddBuilder.Animations[0].Frames.Clear();
+                eddBuilder.Animations[0].Frames.Add(firstFrame);
+
                 eddBuilder.Animations.RemoveRange(1, eddBuilder.Animations.Count - 1);
                 emdFile.SetEdd(0, eddBuilder.ToEdd());
                 var emr = pldFile.GetEmr(0)
diff --git a/biohazard-utils b/biohazard-utils
index 73109b653..279cf0836 160000
--- a/biohazard-utils
+++ b/biohazard-utils
@@ -1 +1 @@
-Subproject commit 73109b653966ea1c1d8badeda6ab8906c801ca44
+Subproject commit 279cf08365d3edd5ef7a396e6b0a9e01e88255e5
diff --git a/biorand/biorand.csproj b/biorand/biorand.csproj
index 30396eca6..fc7aefaba 100644
--- a/biorand/biorand.csproj
+++ b/biorand/biorand.csproj
@@ -11,7 +11,6 @@
     <RootNamespace>IntelOrca.Biohazard.BioRand</RootNamespace>
     <ApplicationIcon>biorand.ico</ApplicationIcon>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>DISABLE_CVX;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="biorand.ico" />