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: Add Marlon bedroom entrance rule #3735

Merged

Conversation

agilbert1412
Copy link
Collaborator

What is this fixing or adding?

The book "Monster Compoundium" is found in Marlon's bedroom, but entering this room requires killing 1000 monsters, so I added a rule for that.
It was reported as missing by a play tester.

How was this tested?

Unit tests, including a new one for this book

@github-actions github-actions bot added the waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. label Aug 5, 2024
@agilbert1412 agilbert1412 added the is: bug/fix Issues that are reporting bugs or pull requests that are fixing bugs. label Aug 5, 2024
@agilbert1412
Copy link
Collaborator Author

This PR currently requires #3687 to be merged for its tests to pass properly

@agilbert1412 agilbert1412 added the waiting-on: other Issue/PR is waiting for something else, like another PR. label Aug 5, 2024
@Exempt-Medic
Copy link
Member

This has conflicts now

@agilbert1412 agilbert1412 force-pushed the StardewValley/MarlonBedroomEntrance branch from 4a70838 to abad4ba Compare August 30, 2024 04:53
@agilbert1412
Copy link
Collaborator Author

No more conflicts, no more wait on other :D

@agilbert1412 agilbert1412 removed the waiting-on: other Issue/PR is waiting for something else, like another PR. label Aug 30, 2024
@NewSoupVi NewSoupVi merged commit a7c9643 into ArchipelagoMW:main Sep 17, 2024
15 checks passed
@Jouramie Jouramie deleted the StardewValley/MarlonBedroomEntrance branch October 14, 2024 18:44
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. waiting-on: peer-review Issue/PR has not been reviewed by enough people yet.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants