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

update fence asset propagation in SDV 1.3

This commit is contained in:
Jesse Plamondon-Willard 2018-05-05 22:20:15 -04:00
parent efe94c2653
commit 591b1aca78
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,7 @@ namespace StardewModdingAPI.Metadata
return this.ReloadNpcSprites(content, key, monster: true); return this.ReloadNpcSprites(content, key, monster: true);
if (key.StartsWith(this.GetNormalisedPath("LooseSprites\\Fence"), StringComparison.InvariantCultureIgnoreCase)) if (key.StartsWith(this.GetNormalisedPath("LooseSprites\\Fence"), StringComparison.InvariantCultureIgnoreCase))
return this.ReloadFenceTextures(key); return this.ReloadFenceTextures(content, key);
if (this.IsInFolder(key, "Portraits")) if (this.IsInFolder(key, "Portraits"))
return this.ReloadNpcPortraits(content, key); return this.ReloadNpcPortraits(content, key);
@ -412,9 +412,10 @@ namespace StardewModdingAPI.Metadata
} }
/// <summary>Reload the sprites for a fence type.</summary> /// <summary>Reload the sprites for a fence type.</summary>
/// <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>
/// <returns>Returns whether any textures were reloaded.</returns> /// <returns>Returns whether any textures were reloaded.</returns>
private bool ReloadFenceTextures(string key) private bool ReloadFenceTextures(LocalizedContentManager content, string key)
{ {
// get fence type // get fence type
if (!int.TryParse(this.GetSegments(key)[1].Substring("Fence".Length), out int fenceType)) if (!int.TryParse(this.GetSegments(key)[1].Substring("Fence".Length), out int fenceType))
@ -425,16 +426,16 @@ namespace StardewModdingAPI.Metadata
( (
from location in this.GetLocations() from location in this.GetLocations()
from fence in location.Objects.Values.OfType<Fence>() from fence in location.Objects.Values.OfType<Fence>()
where fenceType == 1 where
? fence.isGate.Value fence.whichType.Value == fenceType
: fence.whichType.Value == fenceType || (fence.isGate.Value && fenceType == 1) // gates are hardcoded to draw fence type 1
select fence select fence
) )
.ToArray(); .ToArray();
// update fence textures // update fence textures
foreach (Fence fence in fences) foreach (Fence fence in fences)
fence.reloadSprite(); this.Reflection.GetField<Lazy<Texture2D>>(fence, "fenceTexture").SetValue(new Lazy<Texture2D>(fence.loadFenceTexture));
return true; return true;
} }