diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-04-01 20:09:44 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-04-01 20:09:44 -0400 |
| commit | 96ec4de7275ae4e0ffc92ca8058c5e04b8ddd20d (patch) | |
| tree | be348bf559424f90a496f70c88d9a16707844d66 | |
| parent | 6f8fb2a68b3e45763c1b71e7f420fd7f174ffc60 (diff) | |
| download | SMAPI-96ec4de7275ae4e0ffc92ca8058c5e04b8ddd20d.tar.gz SMAPI-96ec4de7275ae4e0ffc92ca8058c5e04b8ddd20d.tar.bz2 SMAPI-96ec4de7275ae4e0ffc92ca8058c5e04b8ddd20d.zip | |
fix marriage dialogue left in invalid state after dialogue propagation
| -rw-r--r-- | docs/release-notes.md | 1 | ||||
| -rw-r--r-- | src/SMAPI/Metadata/CoreAssetPropagator.cs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md index 0faf4913..c72e4454 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -10,6 +10,7 @@ * For modders: * Fixed asset propagation on Linux/Mac for monster sprites, NPC dialogue, and NPC schedules. + * Fixed asset propagation for NPC dialogue sometimes causing a spouse to skip marriage dialogue or not allow kisses. ## 3.4.1 Released 24 March 2020 for Stardew Valley 1.4.1 or later. diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs index 30b96c1d..0a14086b 100644 --- a/src/SMAPI/Metadata/CoreAssetPropagator.cs +++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs @@ -892,11 +892,13 @@ namespace StardewModdingAPI.Metadata // doesn't store the text itself. foreach (NPC villager in villagers) { + bool shouldSayMarriageDialogue = villager.shouldSayMarriageDialogue.Value; MarriageDialogueReference[] marriageDialogue = villager.currentMarriageDialogue.ToArray(); villager.resetSeasonalDialogue(); // doesn't only affect seasonal dialogue villager.resetCurrentDialogue(); + villager.shouldSayMarriageDialogue.Set(shouldSayMarriageDialogue); villager.currentMarriageDialogue.Set(marriageDialogue); } |