Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stardew Valley: Added missing logic rules for dating and marriage #2160

Conversation

agilbert1412
Copy link
Collaborator

What is this fixing or adding?

When playing on friendsanity marriage, for some values of heart size, "milestone" hearts can end up being skipped. For example, with heart size 3, the hearts are 3-6-9-12-14, which skips 8 and 10, which are the milestones for dating and marriage.

In order to "earn" heart 9, you need to have 8 hearts and give a bouquet to the NPC to date them. Under the current logic, only heart 6 would be required for heart 9 to be in logic, as the design was "previous heart only". This is a problem, because at 6 hearts, you cannot date the villager, and therefore you cannot "earn" hearts past the 8th one.

This fixes the problem. Any heart earned past 8 requires dating, so 8 minimum received, and any past 10 requires marriage, so 10 minimum received. Taking the same example, in order to "earn" heart 9, you would now need to receive heart 9, in order to give a bouquet.

How was this tested?

Created a new unit test that finds that specific bug before fixing it, then fixed it and ran all of the tests

… need access to dating and marriage respectively.
@black-sliver
Copy link
Member

I'll look at it (test, merge) tonight.

160 sounds like a lot. The 120 is actually already more than is easy to read, however with all the leading white spaces and possibly trailing characters, 120 is still okay-ish most of the time and does not introduce as many forced line breaks as 80 (that also impact readability). This is not just how much you can fit onto your screen layout, but also how far the eyes have to jump when browsing through code.

Copy link
Member

@black-sliver black-sliver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@black-sliver black-sliver merged commit fdac505 into ArchipelagoMW:main Sep 14, 2023
12 checks passed
@ThePhar ThePhar changed the title Stardew Valley - Added missing logic rules for dating and marriage Stardew Valley: Added missing logic rules for dating and marriage Oct 16, 2023
@ThePhar ThePhar added the is: bug/fix Issues that are reporting bugs or pull requests that are fixing bugs. label Oct 16, 2023
FlySniper pushed a commit to FlySniper/Archipelago that referenced this pull request Nov 14, 2023
…chipelagoMW#2160)

* - Added missing logic rules where, to earn hearts above 8 and 10, you need access to dating and marriage respectively.

* - Slight cleanup based on Black Sliver's suggestion
@agilbert1412 agilbert1412 deleted the StardewValley/DatingAndMarriageLogic branch December 6, 2023 14:42
Jouramie pushed a commit to Jouramie/Archipelago that referenced this pull request Feb 28, 2024
…chipelagoMW#2160)

* - Added missing logic rules where, to earn hearts above 8 and 10, you need access to dating and marriage respectively.

* - Slight cleanup based on Black Sliver's suggestion
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
is: bug/fix Issues that are reporting bugs or pull requests that are fixing bugs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants