Skip to content

Fixed crash that happened when trying to load Sekiro c5080 and c5090 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
solbarda wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fixed crash that happened when trying to load Sekiro c5080 and c5090 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43f22fa
Bump System.Net.Http from 4.3.0 to 4.3.4 in /DSAnimStudio
dependabot[bot] Apr 21, 2021
b5f4882
Added StateInfoByte to SpawnOneShotFFX for Sekiro
BaaridunNasr May 31, 2021
141f5df
Changed Field Name to remove Byte
BaaridunNasr May 31, 2021
6791546
SpawnOneShotFFX fixed for dynamic VFX
BaaridunNasr Jun 15, 2021
d60dcf4
Merge pull request #25 from PhantomKunai/dev-kunai/StateInfoByteFix
Meowmaritus Jun 15, 2021
c497846
Merge pull request #23 from Meowmaritus/dependabot/nuget/DSAnimStudio…
Meowmaritus Jun 15, 2021
93e114e
Fixed crash that happened when trying to load Sekiro c5080 and c5090
solbarda Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions DSAnimStudio/FlverSubmeshRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
1 change: 1 addition & 0 deletions DSAnimStudio/Res/TAE.Template.SDT.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@
<b name="IsFollowDummyPoly"/>
<b name="IsRestrictToDummyPoly"/>
<u8 name="ExtraSpawnCondition"/>
<s16 name="StateInfo"/>
</event>
<event id="99" name="SpawnRepeatingFFX">
<s32 name="FFXID"/>
Expand Down
2 changes: 1 addition & 1 deletion DSAnimStudio/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down