summaryrefslogtreecommitdiff
path: root/src/SMAPI
diff options
context:
space:
mode:
Diffstat (limited to 'src/SMAPI')
-rw-r--r--src/SMAPI/Constants.cs4
-rw-r--r--src/SMAPI/Framework/SCore.cs1
-rw-r--r--src/SMAPI/Framework/SGame.cs12
-rw-r--r--src/SMAPI/Metadata/CoreAssetPropagator.cs66
4 files changed, 47 insertions, 36 deletions
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 2c0b85b7..b72471ca 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -54,10 +54,10 @@ namespace StardewModdingAPI
** Public
****/
/// <summary>SMAPI's current semantic version.</summary>
- public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.8.3");
+ public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.8.4");
/// <summary>The minimum supported version of Stardew Valley.</summary>
- public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.5.2");
+ public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.5.3");
/// <summary>The maximum supported version of Stardew Valley.</summary>
public static ISemanticVersion MaximumGameVersion { get; } = null;
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index 3a51b418..f9a36593 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -619,6 +619,7 @@ namespace StardewModdingAPI.Framework
if (Game1.currentLoader != null)
{
this.Monitor.Log("Game loader synchronizing...");
+ this.Reflection.GetMethod(Game1.game1, "UpdateTitleScreen").Invoke(Game1.currentGameTime); // run game logic to change music on load, etc
while (Game1.currentLoader?.MoveNext() == true)
{
// raise load stage changed
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index 2ede40ae..42a712ee 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -740,16 +740,20 @@ namespace StardewModdingAPI.Framework
Game1.spriteBatch.Draw(Game1.staminaRect, new Microsoft.Xna.Framework.Rectangle(startingX, (int)y, Game1.graphics.GraphicsDevice.Viewport.Width, 1), Microsoft.Xna.Framework.Color.Red * 0.5f);
}
}
+ if (Game1.ShouldShowOnscreenUsernames() && Game1.currentLocation != null)
+ {
+ Game1.currentLocation.DrawFarmerUsernames(Game1.spriteBatch);
+ }
if (Game1.currentBillboard != 0 && !this.takingMapScreenshot)
{
this.drawBillboard();
}
if (!Game1.eventUp && Game1.farmEvent == null && Game1.currentBillboard == 0 && Game1.gameMode == 3 && !this.takingMapScreenshot && Game1.isOutdoorMapSmallerThanViewport())
{
- Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Microsoft.Xna.Framework.Rectangle(0, 0, -Math.Min(Game1.viewport.X, 4096), Game1.graphics.GraphicsDevice.Viewport.Height), Microsoft.Xna.Framework.Color.Black);
- Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Microsoft.Xna.Framework.Rectangle(-Game1.viewport.X + Game1.currentLocation.map.Layers[0].LayerWidth * 64, 0, Math.Min(4096, Game1.graphics.GraphicsDevice.Viewport.Width - (-Game1.viewport.X + Game1.currentLocation.map.Layers[0].LayerWidth * 64)), Game1.graphics.GraphicsDevice.Viewport.Height), Microsoft.Xna.Framework.Color.Black);
- Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Microsoft.Xna.Framework.Rectangle(0, 0, Game1.graphics.GraphicsDevice.Viewport.Width, -Math.Min(Game1.viewport.Y, 4096)), Microsoft.Xna.Framework.Color.Black);
- Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Microsoft.Xna.Framework.Rectangle(0, -Game1.viewport.Y + Game1.currentLocation.map.Layers[0].LayerHeight * 64, Game1.graphics.GraphicsDevice.Viewport.Width, Math.Min(4096, Game1.graphics.GraphicsDevice.Viewport.Height - (-Game1.viewport.Y + Game1.currentLocation.map.Layers[0].LayerHeight * 64))), Microsoft.Xna.Framework.Color.Black);
+ Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Microsoft.Xna.Framework.Rectangle(0, 0, -Math.Min(Game1.viewport.X, GameRunner.MaxTextureSize), Game1.graphics.GraphicsDevice.Viewport.Height), Microsoft.Xna.Framework.Color.Black);
+ Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Microsoft.Xna.Framework.Rectangle(-Game1.viewport.X + Game1.currentLocation.map.Layers[0].LayerWidth * 64, 0, Math.Min(GameRunner.MaxTextureSize, Game1.graphics.GraphicsDevice.Viewport.Width - (-Game1.viewport.X + Game1.currentLocation.map.Layers[0].LayerWidth * 64)), Game1.graphics.GraphicsDevice.Viewport.Height), Microsoft.Xna.Framework.Color.Black);
+ Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Microsoft.Xna.Framework.Rectangle(0, 0, Game1.graphics.GraphicsDevice.Viewport.Width, -Math.Min(Game1.viewport.Y, GameRunner.MaxTextureSize)), Microsoft.Xna.Framework.Color.Black);
+ Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Microsoft.Xna.Framework.Rectangle(0, -Game1.viewport.Y + Game1.currentLocation.map.Layers[0].LayerHeight * 64, Game1.graphics.GraphicsDevice.Viewport.Width, Math.Min(GameRunner.MaxTextureSize, Game1.graphics.GraphicsDevice.Viewport.Height - (-Game1.viewport.Y + Game1.currentLocation.map.Layers[0].LayerHeight * 64))), Microsoft.Xna.Framework.Color.Black);
}
Game1.spriteBatch.End();
Game1.PushUIMode();
diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index b82dedfd..bd1cc50e 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -138,36 +138,7 @@ namespace StardewModdingAPI.Metadata
{
if (!string.IsNullOrWhiteSpace(location.mapPath.Value) && this.NormalizeAssetNameIgnoringEmpty(location.mapPath.Value) == key)
{
- // reset patch caches
- switch (location)
- {
- case Town _:
- this.Reflection.GetField<bool>(location, "ccRefurbished").SetValue(false);
- this.Reflection.GetField<bool>(location, "isShowingDestroyedJoja").SetValue(false);
- this.Reflection.GetField<bool>(location, "isShowingUpgradedPamHouse").SetValue(false);
- break;
-
- case Beach _:
- case BeachNightMarket _:
- case Forest _:
- this.Reflection.GetField<bool>(location, "hasShownCCUpgrade").SetValue(false);
- break;
- }
-
- // general updates
- location.reloadMap();
- location.updateSeasonalTileSheets();
- location.updateWarps();
-
- // update interior doors
- location.interiorDoors.Clear();
- foreach (var entry in new InteriorDoorDictionary(location))
- location.interiorDoors.Add(entry);
-
- // update doors
- location.doors.Clear();
- location.updateDoors();
-
+ this.ReloadMap(location);
anyChanged = true;
}
}
@@ -803,6 +774,41 @@ namespace StardewModdingAPI.Metadata
return true;
}
+ /// <summary>Reload the map for a location.</summary>
+ /// <param name="location">The location whose map to reload.</param>
+ private void ReloadMap(GameLocation location)
+ {
+ // reset patch caches
+ switch (location)
+ {
+ case Town _:
+ this.Reflection.GetField<bool>(location, "ccRefurbished").SetValue(false);
+ this.Reflection.GetField<bool>(location, "isShowingDestroyedJoja").SetValue(false);
+ this.Reflection.GetField<bool>(location, "isShowingUpgradedPamHouse").SetValue(false);
+ break;
+
+ case Beach _:
+ case BeachNightMarket _:
+ case Forest _:
+ this.Reflection.GetField<bool>(location, "hasShownCCUpgrade").SetValue(false);
+ break;
+ }
+
+ // general updates
+ location.reloadMap();
+ location.updateSeasonalTileSheets();
+ location.updateWarps();
+
+ // update interior doors
+ location.interiorDoors.Clear();
+ foreach (var entry in new InteriorDoorDictionary(location))
+ location.interiorDoors.Add(entry);
+
+ // update doors
+ location.doors.Clear();
+ location.updateDoors();
+ }
+
/// <summary>Reload the disposition data for matching NPCs.</summary>
/// <param name="content">The content manager through which to reload the asset.</param>
/// <param name="key">The asset key to reload.</param>
generated by cgit (git 2.46.0) at 2024-12-18 21:56:32 +0000