Merge branch 'develop' into stable

Author: Pathoschild

ContentPatcher/ContentPatcher.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>2.7.0</Version>
+    <Version>2.7.1</Version>
     <RootNamespace>ContentPatcher</RootNamespace>
   </PropertyGroup>
 

ContentPatcher/Framework/Migrations/Migration_2_7.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using ContentPatcher.Framework.ConfigModels;
+using Newtonsoft.Json.Linq;
+using StardewModdingAPI;
+using StardewValley.GameData.Characters;
+
+namespace ContentPatcher.Framework.Migrations;
+
+/// <summary>Migrates patches to format version 2.6.</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Named for clarity.")]
+internal class Migration_2_7 : BaseMigration
+{
+    /*********
+    ** Public methods
+    *********/
+    /// <summary>Construct an instance.</summary>
+    public Migration_2_7()
+        : base(new SemanticVersion(2, 7, 0)) { }
+
+    /// <inheritdoc />
+    public override bool TryMigrate(ref PatchConfig[] patches, [NotNullWhen(false)] out string? error)
+    {
+        if (!base.TryMigrate(ref patches, out error))
+            return false;
+
+        // 2.7 fixes a bug where you could set an enum field to a boolean value. This would previously be converted
+        // numerically (like true -> 1 -> "MainGroup"), so match that logic for affected fields.
+        //
+        // This is based on the known affected content packs; it's not intended to cover every possible scenario (e.g.
+        // patches which target "Data\Characters" or use 'Fields' instead).
+        foreach (PatchConfig patch in patches)
+        {
+            if (patch.Entries.Count > 0 && string.Equals(patch.Target, "Data/Characters", StringComparison.OrdinalIgnoreCase))
+            {
+                foreach (JToken? rawEntry in patch.Entries.Values)
+                {
+                    if (rawEntry is not JObject entry)
+                        continue;
+
+                    JProperty? property = entry.Property(nameof(CharacterData.EndSlideShow), StringComparison.OrdinalIgnoreCase);
+                    if (property is null)
+                        continue;
+
+                    string? rawValue = property.Value.Value<string>();
+                    if (string.Equals(rawValue, bool.TrueString, StringComparison.OrdinalIgnoreCase))
+                        property.Value = nameof(EndSlideShowBehavior.MainGroup);
+                    else if (string.Equals(rawValue, bool.FalseString, StringComparison.OrdinalIgnoreCase))
+                        property.Value = nameof(EndSlideShowBehavior.Hidden);
+                }
+            }
+        }
+
+        return true;
+    }
+}

ContentPatcher/ModEntry.cs

@@ -79,7 +79,7 @@ internal class ModEntry : Mod
         new Migration_2_4(),
         new Migration_2_5(),
         new Migration_2_6(),
-        new EmptyMigration(2, 7)
+        new Migration_2_7()
     ];
 
     /// <summary>The special validation logic to apply to assets affected by patches.</summary>

ContentPatcher/docs/release-notes.md

@@ -9,14 +9,21 @@ When releasing a format change, don't forget to update the smapi.io/json schema!
 
 
 -->
+## 2.7.1
+Released 28 May 2025 for SMAPI 4.1.10 or later.
+
+* Fixed content packs which incorrectly set `EndSlideShow` in `Data/Characters` to a true/false value.  
+  _Content Patcher 2.7.0 fixed a bug that allowed setting enum fields to a boolean value; 2.7.1 adds a format migration so older content packs will work like before._
+
 ## 2.7.0
-Released 27 May 2025 for SMAPI 4.1.10 or later.
+Released 27 May 2025 for SMAPI 4.1.10 or later. See [release highlights](https://www.patreon.com/posts/130042997).
 
 * The `Priority` patch field is now sent to SMAPI to influence patch order relative to non-Content Patcher mods too (thanks to ichortower!).
 * The `patch export` command now auto-detects the type for all vanilla top-level data assets (thanks to SinZ!).
 * Fixed `EditData` patches appending to a list/dictionary field instead of replacing it in some cases.
 * Fixed `EditData`'s handling of certain Windows-only data formats when playing on Android/Linux/macOS.
 * Fixed `EditData`'s handling of data model fields with tokens in both the name and value (thanks to SinZ!).
+* Fixed `EditData` incorrectly allowing true/false values for enum fields and mapping them transitively (like `true` → `1` → `"MainGroup"`).
 * Clarified in [token docs](author-guide/tokens.md) that tokens use NPCs' internal names (thanks to DenisSilent!).
 
 **Update notes for players:**