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.

Sign up for GitHub

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

Jump to bottom

Stardew Valley: Generate proper filler for item links #2069

Merged
merged 10 commits into from
Nov 22, 2023
Merged

Stardew Valley: Generate proper filler for item links #2069

merged 10 commits into from
Nov 22, 2023

Conversation

agilbert1412
Copy link
Collaborator

What is this fixing or adding?

It was brought to my attention that when playing with item links, Stardew Valley only generates Joja Cola. I fixed that to generate any resource pack. It can also provide traps if traps are enabled. Special conditional resource packs will only be provided if they should, based on settings

How was this tested?

New unit tests for that feature, then running every test

@ProfBytes
Copy link

This should not generate traps. If it does and replacement_link is on, it'll send traps to players with traps disabled.

@alwaysintreble
Copy link
Collaborator

This should not generate traps. If it does and replacement_link is on, it'll send traps to players with traps disabled.

This is incorrect. The replacement items have to be the same for them to be linked.

@ProfBytes
Copy link

This should not generate traps. If it does and replacement_link is on, it'll send traps to players with traps disabled.

This is incorrect. The replacement items have to be the same for them to be linked.

The documentation is wrong then. The advanced yaml guide explicitly says that if link_replacement is true, they will be linked. (I got the wrong order of the words in link replacement, so maybe that caused confusion)
This can be easily tested with a 2 game item link with one game having traps on and the other having them off.

@ThePhar ThePhar added the is: enhancement Issues requesting new features or pull requests implementing new features. label Aug 16, 2023
el-u
el-u reviewed Aug 24, 2023
View reviewed changes
worlds/stardew_valley/__init__.py Outdated Show resolved Hide resolved
worlds/stardew_valley/test/TestItemLink.py Outdated Show resolved Hide resolved
@ThePhar
Copy link
Member

ThePhar commented Nov 22, 2023

Has new merge conflicts now.
image

@agilbert1412 agilbert1412 force-pushed the StardewValley/GenerateProperFillerForItemLinks branch from fa42f5d to d7d437c Compare November 22, 2023 15:11
@agilbert1412
Copy link
Collaborator Author

Has new merge conflicts now.

@ThePhar Fixed

ThePhar
ThePhar requested changes Nov 22, 2023
View reviewed changes
worlds/stardew_valley/__init__.py Outdated Show resolved Hide resolved
worlds/stardew_valley/__init__.py Outdated Show resolved Hide resolved
@ThePhar ThePhar merged commit 0f98cf5 into ArchipelagoMW:main Nov 22, 2023
12 checks passed
Jouramie pushed a commit to Jouramie/Archipelago that referenced this pull request Feb 28, 2024
@agilbert1412 @ThePhar @Jouramie
Stardew Valley: Generate proper filler for item links (ArchipelagoMW#…
ed8e3bb 
…2069)

Co-authored-by: Zach Parks <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alwaysintreble alwaysintreble alwaysintreble left review comments

@el-u el-u el-u approved these changes

@ThePhar ThePhar ThePhar approved these changes

Assignees
No one assigned
Labels
is: enhancement Issues requesting new features or pull requests implementing new features.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@agilbert1412 @ProfBytes @alwaysintreble @ThePhar @el-u