StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

standardise folder checks when reloading assets (#459)

This commit is contained in:
Jesse Plamondon-Willard 2018-03-25 13:28:38 -04:00
parent 04e299aeaa
commit 0bcc1f6be9
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/SMAPI/Metadata/CoreAssetPropagator.cs
View File

@ -326,19 +326,19 @@ namespace StardewModdingAPI.Metadata
} }
// dynamic textures // dynamic textures
if (key.StartsWith(this.GetNormalisedPath("Buildings\\"), StringComparison.InvariantCultureIgnoreCase)) if (this.IsInFolder(key, "Buildings"))
return this.ReloadBuildings(content, key); return this.ReloadBuildings(content, key);
if (key.StartsWith(this.GetNormalisedPath("Characters\\")) && this.CountSegments(key) == 2) // ignore Characters/Dialogue/*, etc if (this.IsInFolder(key, "Characters"))
return this.ReloadNpcSprites(content, key, monster: false); return this.ReloadNpcSprites(content, key, monster: false);
if (key.StartsWith(this.GetNormalisedPath("Characters\\Monsters\\"))) if (this.IsInFolder(key, "Characters\\Monsters"))
return this.ReloadNpcSprites(content, key, monster: true); return this.ReloadNpcSprites(content, key, monster: true);
if (key.StartsWith(this.GetNormalisedPath("LooseSprites\\Fence"))) if (key.StartsWith(this.GetNormalisedPath("LooseSprites\\Fence"), StringComparison.InvariantCultureIgnoreCase))
return this.ReloadFenceTextures(content, key); return this.ReloadFenceTextures(content, key);
if (key.StartsWith(this.GetNormalisedPath("Portraits\\"))) if (this.IsInFolder(key, "Portraits"))
return this.ReloadNpcPortraits(content, key); return this.ReloadNpcPortraits(content, key);
return false; return false;
@ -348,6 +348,9 @@ namespace StardewModdingAPI.Metadata
/********* /*********
** Private methods ** Private methods
*********/ *********/
/****
** Reload methods
****/
/// <summary>Reload building textures.</summary> /// <summary>Reload building textures.</summary>
/// <param name="content">The content manager through which to reload the asset.</param> /// <param name="content">The content manager through which to reload the asset.</param>
/// <param name="key">The asset key to reload.</param> /// <param name="key">The asset key to reload.</param>
@ -491,6 +494,9 @@ namespace StardewModdingAPI.Metadata
return false; return false;
} }
/****
** Helpers
****/
/// <summary>Get an NPC name from the name of their file under <c>Content/Characters</c>.</summary> /// <summary>Get an NPC name from the name of their file under <c>Content/Characters</c>.</summary>
/// <param name="name">The file name.</param> /// <param name="name">The file name.</param>
/// <remarks>Derived from <see cref="NPC.reloadSprite"/>.</remarks> /// <remarks>Derived from <see cref="NPC.reloadSprite"/>.</remarks>
@ -527,6 +533,17 @@ namespace StardewModdingAPI.Metadata
} }
} }
/// <summary>Get whether a normalised asset key is in the given folder.</summary>
/// <param name="key">The normalised asset key (like <c>Animals/cat</c>).</param>
/// <param name="folder">The key folder (like <c>Animals</c>); doesn't need to be normalised.</param>
/// <param name="allowSubfolders">Whether to return true if the key is inside a subfolder of the <paramref name="folder"/>.</param>
private bool IsInFolder(string key, string folder, bool allowSubfolders = false)
{
return
key.StartsWith(this.GetNormalisedPath($"{folder}\\"), StringComparison.InvariantCultureIgnoreCase)
&& (allowSubfolders || this.CountSegments(key) == this.CountSegments(folder) + 1);
}
/// <summary>Get the segments in a path (e.g. 'a/b' is 'a' and 'b').</summary> /// <summary>Get the segments in a path (e.g. 'a/b' is 'a' and 'b').</summary>
/// <param name="path">The path to check.</param> /// <param name="path">The path to check.</param>
private string[] GetSegments(string path) private string[] GetSegments(string path)