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

Muse Dash: Add filler items and rework generation balance #2809

Merged
merged 20 commits into from
Apr 14, 2024

Conversation

DeamonHunter
Copy link
Collaborator

What is this fixing or adding?

This PR aims to fix a problem within Muse Dash. The total lack of filler items. This ends up changing the balance of the Muse Dash rando so other changes have been made.

Full list of changes:

  • Added 3 filler items. These are 1 time consumables to Muse Dash.
  • Made all songs have 2 locations. (Rather than a percentage of them)
    • This was to simplify balance. (Having a variable amount of songs meant that Muse Dash could be generated without filler.)
  • When filling the multiworld the following changes were made:
    • Music Sheet count has been slightly lowered. (No Longer double counts starting songs.)
    • After adding music sheets and the initial lot of songs (and traps), 50% of the remaining spots are now filled with filler.
    • The final remaining slots are filled with duplicate songs. These songs are no longer progressive.

How was this tested?

Using multiple Beta Test games using discord. As well as existing tests to ensure no old functionality was broken.

@DeamonHunter DeamonHunter added the is: enhancement Issues requesting new features or pull requests implementing new features. label Feb 10, 2024
Copy link
Contributor

@nicholassaylor nicholassaylor left a comment

Choose a reason for hiding this comment

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

Options and presets look good except for a small typo in the tooltip marked in the review.

Only reviewed Options and Presets

worlds/musedash/Options.py Outdated Show resolved Hide resolved
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
@ScipioWright ScipioWright added the waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. label Feb 10, 2024
Copy link
Contributor

@qwint qwint left a comment

Choose a reason for hiding this comment

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

Reviewed code updates and everything I was concerned about turned out to be already covered, (like create_items() seemingly being ok with adding more items than locations, but not being mathematically possible)

Also ran generate on different song count, trap settings, and music sheet percents (making sure to confirm both none trap types and 0 trap percent don't add any traps to the pool) to confirm no fill errors are weird values,
but did not play any games as I don't own it.

One thing that shouldn't stop this PR at all but is good to note is the TestDifficultyRanges test file is still using multiworld.option, even though the rest of the world is up to date.

That and i'm assuming the Unit test failure is a random failure, nothing failed on my machine (but I'm not running the same profile that failed)

@nicholassaylor
Copy link
Contributor

That and i'm assuming the Unit test failure is a random failure, nothing failed on my machine (but I'm not running the same profile that failed)

Failure is from MMBN3 and is unrelated to the PR (for those concerned with the failure)

@DeamonHunter
Copy link
Collaborator Author

Thanks for catching the old options usage. And yes the old test failure was unrelated to the PR.

It should be impossible for the create items func to create more items than locations. It does seem to not care at first, but that is because all worlds will have enough space for a copy of every song, plus all the music sheets required. (As every song has 2 locations now.) And then every step after that checks to ensure it doesn't add too much.

remyjette added a commit to remyjette/Archipelago that referenced this pull request Apr 11, 2024
…temsTry2

# Conflicts:
#	worlds/musedash/MuseDashCollection.py
@DeamonHunter DeamonHunter added waiting-on: core-review Issue/PR has been peer-reviewed and is ready to be merged or needs input from a core maintainer. and removed waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. labels Apr 14, 2024
@DeamonHunter
Copy link
Collaborator Author

Resolved the merge conflict. Bringing this to core-review.

Special note if merging before the big async. This does end up removing the option additional_item_percentage which doesn't affect too much, but might need a bit of manual adjusting of yamls.

Copy link
Contributor

@nicholassaylor nicholassaylor left a comment

Choose a reason for hiding this comment

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

Changes I requested were fixed

@Berserker66 Berserker66 merged commit d1274c1 into ArchipelagoMW:main Apr 14, 2024
15 checks passed
EmilyV99 pushed a commit to EmilyV99/Archipelago that referenced this pull request Apr 15, 2024
EmilyV99 pushed a commit to EmilyV99/Archipelago that referenced this pull request Apr 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
is: enhancement Issues requesting new features or pull requests implementing new features. waiting-on: core-review Issue/PR has been peer-reviewed and is ready to be merged or needs input from a core maintainer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants