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 6.x.x: The Content Update #3478

Merged
merged 328 commits into from
Jul 7, 2024

Conversation

agilbert1412
Copy link
Collaborator

Update Stardew Valley to Major Version 6.x.x - The Content Update

What is this fixing or adding?

Focus of the Update: Compatibility with Stardew Valley 1.6 Released on March 19th 2024
This includes randomization for pretty much all of the new content, including but not limited to

  • Raccoon Bundles
  • Booksanity
  • Skill Masteries
  • New Recipes, Craftables, Fish, Maps, Farm Type, Festivals and Quests

This also includes a significant reorganisation of the code into "Content Packs", to allow for easier modularity of various game mechanics between the settings and the supported mods. This improves maintainability quite a bit.

In addition to that, a few very requested new features have been introduced, although they weren't the focus of this update

  • Walnutsanity
  • Player Buffs
  • More customizability in settings, such as shorter special orders, ER without farmhouse
  • New Remixed Bundles

How was this tested?

As always, we have added relevant unit tests to all of our use cases, within reason, and maintained the already extensive test suite. Furthermore, bugs are made less likely by the fact that most of the changes in this update are purely mod-side, due to the massive changes to the vanilla game, its engine and its code. The apworld changes, in comparison, are pretty minuscule.

We have also been hosting a public opt-in beta in the Archipelago Discord, where a number of players have been playing a very high number of randomized games over the past two months. They have been a massive help in finding and squishing bugs on both sides. Plus, a few private beta tests have also been run, that I am aware of.

Mods and check count

The check count for the vanilla game has increased from ([Minimum-Default-Maximum]) 76-422-1956 to 85-491-2238, but the check count for modded games has instead decreased, due to 11 mods out of our 26 not having received a 1.6 Update, and being deprecated in this version.
We have maintained their code in the apworld (items, locations and logic), because we expect them to eventually update to 1.6, but they have been temporarily disabled from generating games, so that players cannot generate games that could then not be played properly.

@agilbert1412 agilbert1412 added is: enhancement Issues requesting new features or pull requests implementing new features. is: maintenance Regular updates to requirements and utilities that do not fix bugs or change/add features. waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. and removed is: maintenance Regular updates to requirements and utilities that do not fix bugs or change/add features. labels Jun 6, 2024
worlds/stardew_valley/rules.py Fixed Show resolved Hide resolved
worlds/stardew_valley/options.py Show resolved Hide resolved
worlds/stardew_valley/bundles/bundle.py Outdated Show resolved Hide resolved
worlds/stardew_valley/bundles/bundles.py Outdated Show resolved Hide resolved
Copy link
Contributor

@Jouramie Jouramie left a comment

Choose a reason for hiding this comment

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

I've reread everything and cleaned up a bit. Only two things I could not answer myself.

LGTM!

worlds/stardew_valley/items.py Outdated Show resolved Hide resolved
worlds/stardew_valley/presets.py Outdated Show resolved Hide resolved
Copy link
Collaborator Author

@agilbert1412 agilbert1412 left a comment

Choose a reason for hiding this comment

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

I went over all of the code again, made a few comments for Jouramie and myself to look at, then it would be an approval if my opinion was allowed

worlds/stardew_valley/logic/time_logic.py Outdated Show resolved Hide resolved
@agilbert1412 agilbert1412 requested a review from NewSoupVi as a code owner June 13, 2024 02:21
@github-actions github-actions bot added affects: core Issues/PRs that touch core and may need additional validation. affects: webhost Issues/PRs that touch webhost and may need additional validation. labels Jun 13, 2024
@agilbert1412 agilbert1412 force-pushed the StardewValley/6.x.x branch from 95bf69b to 01a83b3 Compare June 13, 2024 02:23
@agilbert1412 agilbert1412 removed affects: core Issues/PRs that touch core and may need additional validation. affects: webhost Issues/PRs that touch webhost and may need additional validation. labels Jun 13, 2024
Copy link
Contributor

@EmilyV99 EmilyV99 left a comment

Choose a reason for hiding this comment

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

LGTM. Only skimmed the tests stuff, but everything else seems sound. Pointed out a couple small things, but overall looks good to go.

worlds/stardew_valley/content/vanilla/qi_board.py Outdated Show resolved Hide resolved
worlds/stardew_valley/data/bundle_data.py Outdated Show resolved Hide resolved
worlds/stardew_valley/logic/cooking_logic.py Show resolved Hide resolved
worlds/stardew_valley/logic/crafting_logic.py Outdated Show resolved Hide resolved
worlds/stardew_valley/logic/logic.py Outdated Show resolved Hide resolved
Copy link
Member

@Berserker66 Berserker66 left a comment

Choose a reason for hiding this comment

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

Looked it over and didn't see anything offensive; I guess this is the part where I trust that this will explode main as soon I hit merge.

@Berserker66
Copy link
Member

image
I guess I don't hit merge then? Are you waiting for specific feedback?

@agilbert1412
Copy link
Collaborator Author

agilbert1412 commented Jul 5, 2024

@Berserker66 Vi was requested by mistake, but I will ask that you don't hit merge yet, as a couple mod-related bugs were found yesterday and are being addressed in agilbert1412#25.
We expect to be done with this today

@agilbert1412
Copy link
Collaborator Author

Or, if it is your preference, we can merge here and retarget the other PR towards AP main. That is also okay with me

@agilbert1412
Copy link
Collaborator Author

Alright @Berserker66 the side PR has been merged, so you're free to do what you want :)
I ran the tests locally, but it can't hurt to let the test run here finish as well of course

@agilbert1412 agilbert1412 removed the request for review from NewSoupVi July 5, 2024 22:16
@Berserker66 Berserker66 merged commit 9b22458 into ArchipelagoMW:main Jul 7, 2024
17 checks passed
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: 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.

6 participants