From 534142009d4b94038150827398b9020edebfe4c0 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Fri, 16 Oct 2020 17:42:13 -0400 Subject: [PATCH 1/2] reapply the game's town map changes in asset propagation --- docs/release-notes.md | 4 ++++ src/SMAPI/Metadata/CoreAssetPropagator.cs | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/docs/release-notes.md b/docs/release-notes.md index 16afd6378..c0a6551db 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -7,6 +7,10 @@ * Migrated to Harmony 2.0 (see [_migrate to Harmony 2.0_](https://stardewvalleywiki.com/Modding:Migrate_to_Harmony_2.0) for more info). --> +## Upcoming release +* For modders: + * Fixed town map asset propagation not reapplying the game's community center, JojaMart, or Pam house changes. + ## 3.7.4 Released 03 October 2020 for Stardew Valley 1.4.1 or later. diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs index 701bc9f23..307bb11b5 100644 --- a/src/SMAPI/Metadata/CoreAssetPropagator.cs +++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs @@ -138,6 +138,14 @@ private bool PropagateOther(LocalizedContentManager content, string key, Type ty { if (!string.IsNullOrWhiteSpace(location.mapPath.Value) && this.NormalizeAssetNameIgnoringEmpty(location.mapPath.Value) == key) { + // reset town caches + if (location is Town town) + { + this.Reflection.GetField(town, "ccRefurbished").SetValue(false); + this.Reflection.GetField(town, "isShowingDestroyedJoja").SetValue(false); + this.Reflection.GetField(town, "isShowingUpgradedPamHouse").SetValue(false); + } + // general updates location.reloadMap(); location.updateSeasonalTileSheets(); From 4aecc2aabadd7b969aebd4c8914f433fc079fd53 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Fri, 16 Oct 2020 20:09:03 -0400 Subject: [PATCH 2/2] prepare for release --- build/common.targets | 2 +- docs/release-notes.md | 6 ++++-- src/SMAPI.Mods.ConsoleCommands/manifest.json | 4 ++-- src/SMAPI.Mods.SaveBackup/manifest.json | 4 ++-- src/SMAPI/Constants.cs | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build/common.targets b/build/common.targets index 171279a59..8e6871900 100644 --- a/build/common.targets +++ b/build/common.targets @@ -4,7 +4,7 @@ - 3.7.4 + 3.7.5 SMAPI latest diff --git a/docs/release-notes.md b/docs/release-notes.md index c0a6551db..a11721d4c 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -7,9 +7,11 @@ * Migrated to Harmony 2.0 (see [_migrate to Harmony 2.0_](https://stardewvalleywiki.com/Modding:Migrate_to_Harmony_2.0) for more info). --> -## Upcoming release +## 3.7.5 +Released 16 October 2020 for Stardew Valley 1.4.1 or later. + * For modders: - * Fixed town map asset propagation not reapplying the game's community center, JojaMart, or Pam house changes. + * Fixed changes to the town map asset not reapplying the game's community center, JojaMart, and Pam house changes. ## 3.7.4 Released 03 October 2020 for Stardew Valley 1.4.1 or later. diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json index a8499ce27..300350e47 100644 --- a/src/SMAPI.Mods.ConsoleCommands/manifest.json +++ b/src/SMAPI.Mods.ConsoleCommands/manifest.json @@ -1,9 +1,9 @@ { "Name": "Console Commands", "Author": "SMAPI", - "Version": "3.7.4", + "Version": "3.7.5", "Description": "Adds SMAPI console commands that let you manipulate the game.", "UniqueID": "SMAPI.ConsoleCommands", "EntryDll": "ConsoleCommands.dll", - "MinimumApiVersion": "3.7.4" + "MinimumApiVersion": "3.7.5" } diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json index ed0d94a93..d1d8ae322 100644 --- a/src/SMAPI.Mods.SaveBackup/manifest.json +++ b/src/SMAPI.Mods.SaveBackup/manifest.json @@ -1,9 +1,9 @@ { "Name": "Save Backup", "Author": "SMAPI", - "Version": "3.7.4", + "Version": "3.7.5", "Description": "Automatically backs up all your saves once per day into its folder.", "UniqueID": "SMAPI.SaveBackup", "EntryDll": "SaveBackup.dll", - "MinimumApiVersion": "3.7.4" + "MinimumApiVersion": "3.7.5" } diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs index 3927d477f..754ab2950 100644 --- a/src/SMAPI/Constants.cs +++ b/src/SMAPI/Constants.cs @@ -51,7 +51,7 @@ public static class Constants ** Public ****/ /// SMAPI's current semantic version. - public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.7.4"); + public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.7.5"); /// The minimum supported version of Stardew Valley. public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.4.1");