- Fixed hearts logic sometimes forgetting to check the actual values

ArchipelagoMW · Jun 28, 2024 · 068dc0b · 068dc0b
1 parent cfffc73
commit 068dc0b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/worlds/stardew_valley/logic/relationship_logic.py b/worlds/stardew_valley/logic/relationship_logic.py
@@ -77,7 +77,7 @@ def has_hearts_with_any_bachelor(self, hearts: int = 1) -> StardewRule:
         if hearts == 0:
             return True_()
 
-        return self.logic.or_(*(self.logic.relationship.has_hearts(name)
+        return self.logic.or_(*(self.logic.relationship.has_hearts(name, hearts)
                                 for name, villager in self.content.villagers.items()
                                 if villager.bachelor))
 
@@ -87,7 +87,7 @@ def has_hearts_with_any(self, hearts: int = 1) -> StardewRule:
         if hearts == 0:
             return True_()
 
-        return self.logic.or_(*(self.logic.relationship.has_hearts(name)
+        return self.logic.or_(*(self.logic.relationship.has_hearts(name, hearts)
                                 for name, villager in self.content.villagers.items()))
 
     def has_hearts_with_n(self, amount: int, hearts: int = 1) -> StardewRule:
@@ -96,7 +96,7 @@ def has_hearts_with_n(self, amount: int, hearts: int = 1) -> StardewRule:
         if hearts == 0 or amount == 0:
             return True_()
 
-        return self.logic.count(amount, *(self.logic.relationship.has_hearts(name)
+        return self.logic.count(amount, *(self.logic.relationship.has_hearts(name, hearts)
                                           for name, villager in self.content.villagers.items()))
 
     # Should be cached