From 43f22fa883e9d8689939ef117c59857aae30939c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 19:50:26 +0000
Subject: [PATCH 1/5] Bump System.Net.Http from 4.3.0 to 4.3.4 in /DSAnimStudio

Bumps System.Net.Http from 4.3.0 to 4.3.4.

Signed-off-by: dependabot[bot] <support@github.com>
---
 DSAnimStudio/packages.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DSAnimStudio/packages.config b/DSAnimStudio/packages.config
index aa99d5f..b1fde04 100644
--- a/DSAnimStudio/packages.config
+++ b/DSAnimStudio/packages.config
@@ -23,7 +23,7 @@
   <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net47" />
   <package id="System.Linq" version="4.3.0" targetFramework="net47" />
   <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net47" />
-  <package id="System.Net.Http" version="4.3.0" targetFramework="net47" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net47" />
   <package id="System.Net.Primitives" version="4.3.0" targetFramework="net47" />
   <package id="System.Net.Sockets" version="4.3.0" targetFramework="net47" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />

From b5f488240461d0cc72ca66f63c0df88e52bd4f3b Mon Sep 17 00:00:00 2001
From: PhantomKunai <baaridun@gmail.com>
Date: Mon, 31 May 2021 10:25:58 +0530
Subject: [PATCH 2/5] Added StateInfoByte to SpawnOneShotFFX for Sekiro

Fixes VFX breaking on save and restores previously broken VFX
---
 DSAnimStudio/Res/TAE.Template.SDT.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/DSAnimStudio/Res/TAE.Template.SDT.xml b/DSAnimStudio/Res/TAE.Template.SDT.xml
index 1a3e75c..2cefe30 100644
--- a/DSAnimStudio/Res/TAE.Template.SDT.xml
+++ b/DSAnimStudio/Res/TAE.Template.SDT.xml
@@ -329,6 +329,7 @@
       <b name="IsFollowDummyPoly"/>
       <b name="IsRestrictToDummyPoly"/>
       <u8 name="ExtraSpawnCondition"/>
+      <u8 name="StateInfoByte"/>
     </event>
     <event id="99" name="SpawnRepeatingFFX">
       <s32 name="FFXID"/>

From 141f5df3baf30706ada39d5cd318db671cfd4545 Mon Sep 17 00:00:00 2001
From: PhantomKunai <baaridun@gmail.com>
Date: Mon, 31 May 2021 11:05:41 +0530
Subject: [PATCH 3/5] Changed Field Name to remove Byte

StateInfoByte field is now StateInfo
---
 DSAnimStudio/Res/TAE.Template.SDT.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DSAnimStudio/Res/TAE.Template.SDT.xml b/DSAnimStudio/Res/TAE.Template.SDT.xml
index 2cefe30..e47eaa2 100644
--- a/DSAnimStudio/Res/TAE.Template.SDT.xml
+++ b/DSAnimStudio/Res/TAE.Template.SDT.xml
@@ -329,7 +329,7 @@
       <b name="IsFollowDummyPoly"/>
       <b name="IsRestrictToDummyPoly"/>
       <u8 name="ExtraSpawnCondition"/>
-      <u8 name="StateInfoByte"/>
+      <u8 name="StateInfo"/>
     </event>
     <event id="99" name="SpawnRepeatingFFX">
       <s32 name="FFXID"/>

From 67915469670ae52008a0fcd08445ef1e5a9821a7 Mon Sep 17 00:00:00 2001
From: PhantomKunai <baaridun@gmail.com>
Date: Tue, 15 Jun 2021 21:48:56 +0530
Subject: [PATCH 4/5] SpawnOneShotFFX fixed for dynamic VFX

Further investigation indicates that StateInfo is actually s16 rather than u8. This fix works for player and normal enemy vfx.
---
 DSAnimStudio/Res/TAE.Template.SDT.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DSAnimStudio/Res/TAE.Template.SDT.xml b/DSAnimStudio/Res/TAE.Template.SDT.xml
index e47eaa2..0e7390f 100644
--- a/DSAnimStudio/Res/TAE.Template.SDT.xml
+++ b/DSAnimStudio/Res/TAE.Template.SDT.xml
@@ -329,7 +329,7 @@
       <b name="IsFollowDummyPoly"/>
       <b name="IsRestrictToDummyPoly"/>
       <u8 name="ExtraSpawnCondition"/>
-      <u8 name="StateInfo"/>
+      <s16 name="StateInfo"/>
     </event>
     <event id="99" name="SpawnRepeatingFFX">
       <s32 name="FFXID"/>

From 93e114e875e788404351c7a0064dde3c7fb53faf Mon Sep 17 00:00:00 2001
From: solbarda <sorubaruda@gmail.com>
Date: Wed, 30 Jun 2021 20:22:44 +0200
Subject: [PATCH 5/5] Fixed crash that happened when trying to load Sekiro
 c5080 and c5090

---
 DSAnimStudio/FlverSubmeshRenderer.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/DSAnimStudio/FlverSubmeshRenderer.cs b/DSAnimStudio/FlverSubmeshRenderer.cs
index 69b017d..bbd3b17 100644
--- a/DSAnimStudio/FlverSubmeshRenderer.cs
+++ b/DSAnimStudio/FlverSubmeshRenderer.cs
@@ -365,14 +365,20 @@ public FlverSubmeshRenderer(NewMesh parent, FLVER2 flvr, FLVER2.Mesh mesh,
                 if (GameDataManager.GameType == SoulsAssetPipeline.SoulsGames.SDT)
                 {
                     var mtdTex = GameDataManager.LookupMTDTexture(flvr.Materials[mesh.MaterialIndex].MTD, matParam.Type);
-                    shortTexPath = Utils.GetShortIngameFileName(mtdTex.Path).ToLower();
-
+                    
                     texScaleVal /= mtdTex.UVScale;
 
-                    if (string.IsNullOrWhiteSpace(shortTexPath))
+                    // This can be null so store it first to check before accessing it
+                    string mtdTexShortFilename = Utils.GetShortIngameFileName(mtdTex.Path);
+                    if (string.IsNullOrWhiteSpace(mtdTexShortFilename))
                     {
                         shortTexPath = Utils.GetShortIngameFileName(matParam.Path).ToLower();
                     }
+                    else
+                    {
+                        // We only want to use this if mtdTexShortFilename is valid, if not we will crash
+                        shortTexPath = mtdTexShortFilename.ToLower();
+                    }
                 }
 
                 if (GameDataManager.GameType == SoulsAssetPipeline.SoulsGames.DS2SOTFS && paramNameCheck.Contains("FLOWMAP"))