Fix spouse prompt not showing

urbanyeti · Jan 11, 2022 · 0af07a4 · 0af07a4
1 parent f437a4f
commit 0af07a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/BetterFriendship/BetterFriendship/GameExtensions.cs b/BetterFriendship/BetterFriendship/GameExtensions.cs
@@ -35,6 +35,9 @@ public static bool IsTownsfolk(this NPC npc)
         public static bool ShouldOverrideForSpouse(this Character character, ModConfig config) =>
             config.SpousePromptsOverride && character.Name == Game1.player.spouse;
 
+        public static bool IsOutOfDialog(this NPC npc) =>
+            npc is not Child && npc.Name != Game1.player.spouse && npc.CurrentDialogue?.Count == 0;
+
         private static IEnumerable<(Object, int)> TakeTopPrioritized(this IEnumerable<(Object item, int taste)> items,
             ModConfig config)
         {

diff --git a/BetterFriendship/BetterFriendship/ModEntry.cs b/BetterFriendship/BetterFriendship/ModEntry.cs
@@ -85,7 +85,7 @@ npc is Child ||
                    )
                 {
                     if ((!Config.DisplayTalkPrompts && !npc.ShouldOverrideForSpouse(Config)) ||
-                        friendship.TalkedToToday || (npc is not Child && npc.CurrentDialogue?.Count == 0)) continue;
+                        friendship.TalkedToToday || npc.IsOutOfDialog()) continue;
 
                     BubbleDrawer.DrawBubble(Game1.spriteBatch, npc, null, false, true);
                     continue;
@@ -107,7 +107,7 @@ npc is Child ||
                 BubbleDrawer.DrawBubble(Game1.spriteBatch, npc, bestItems,
                     true,
                     (Config.DisplayTalkPrompts || npc.ShouldOverrideForSpouse(Config)) && !friendship.TalkedToToday &&
-                    (npc.CurrentDialogue?.Count > 0 || npc is Child)
+                    !npc.IsOutOfDialog()
                 );
             }
         }