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

A Short Hike: Add new options and option groups #3410

Merged
merged 14 commits into from
Jun 5, 2024
Merged

A Short Hike: Add new options and option groups #3410

merged 14 commits into from
Jun 5, 2024

Conversation

chandler05
Copy link
Contributor

What is this fixing or adding?

Adds a whole slew of new logic-based and item pool options to A Short Hike. Also adds Option Groups. Also renames "Fishing Rod" to "Progressive Fishing Rod".

How was this tested?

Genned 100 worlds with random settings just fine.

@github-actions github-actions bot added the waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. label May 27, 2024
Ixrec
Ixrec reviewed May 27, 2024
View reviewed changes
worlds/shorthike/Items.py Outdated Show resolved Hide resolved
Ixrec
Ixrec reviewed May 27, 2024
View reviewed changes
worlds/shorthike/__init__.py Outdated Show resolved Hide resolved
Ixrec
Ixrec reviewed May 27, 2024
View reviewed changes
worlds/shorthike/Options.py Outdated Show resolved Hide resolved
Ixrec
Ixrec approved these changes May 27, 2024
View reviewed changes
Copy link
Contributor

@Ixrec Ixrec left a comment

Choose a reason for hiding this comment

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

As a player of this game, the code changes look good to me. I have not personally tested this PR.

@chandler05 chandler05 changed the title A Short Hike: Add new Options and Option Groups A Short Hike: Add new options and option groups May 28, 2024
@Exempt-Medic Exempt-Medic added the is: enhancement Issues requesting new features or pull requests implementing new features. label May 30, 2024
Exempt-Medic
Exempt-Medic requested changes May 30, 2024
View reviewed changes
worlds/shorthike/Options.py Outdated Show resolved Hide resolved
worlds/shorthike/Rules.py Outdated Show resolved Hide resolved
worlds/shorthike/__init__.py Outdated Show resolved Hide resolved
@Exempt-Medic
Copy link
Member

Given the options overhaul, you may want to adjust some of your docstrings so they display better on the WebHost. The two that stuck out to me as likely benefitting from an update were these:
Screenshot 2024-05-30 114704
Screenshot 2024-05-30 114713

Exempt-Medic
Exempt-Medic approved these changes May 30, 2024
View reviewed changes
Copy link
Member

@Exempt-Medic Exempt-Medic left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Code LGTM. Comments were addressed. Did hundreds of generations with various games and checked for item/location mismatches. Viewed the new options using WebHost and stepped through and checked that the new logic rules were being applied.

@Exempt-Medic Exempt-Medic 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 Jun 1, 2024
NewSoupVi
NewSoupVi requested changes Jun 4, 2024
View reviewed changes
Copy link
Member

@NewSoupVi NewSoupVi left a comment

Choose a reason for hiding this comment

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

I would like to see the option comparisons changed to something more explicit. Other than that, I'm happy to merge this :)

worlds/shorthike/Rules.py Outdated Show resolved Hide resolved
worlds/shorthike/__init__.py Outdated Show resolved Hide resolved
NewSoupVi
NewSoupVi requested changes Jun 5, 2024
View reviewed changes
worlds/shorthike/Rules.py Outdated Show resolved Hide resolved
@NewSoupVi NewSoupVi merged commit c554c3f into ArchipelagoMW:main Jun 5, 2024
16 checks passed
wu4 pushed a commit to wu4/Archipelago that referenced this pull request Jun 6, 2024
@chandler05 @wu4
A Short Hike: Add new options and option groups (ArchipelagoMW#3410)
b514f44 
* A Short Hike: New options and stuff

* Add to slot data for poptracker

* Address concerns

* Address concerns

* Fix indentations

* Update option description

* Address all issues

* Group "or"s
agilbert1412 pushed a commit to agilbert1412/Archipelago that referenced this pull request Jun 13, 2024
@chandler05 @agilbert1412
A Short Hike: Add new options and option groups (ArchipelagoMW#3410)
c53cd5b 
* A Short Hike: New options and stuff

* Add to slot data for poptracker

* Address concerns

* Address concerns

* Fix indentations

* Update option description

* Address all issues

* Group "or"s
jnschurig pushed a commit to Tranquilite0/Archipelago-SoulBlazer that referenced this pull request Jun 13, 2024
@chandler05
A Short Hike: Add new options and option groups (ArchipelagoMW#3410)
2afcdbb 
* A Short Hike: New options and stuff

* Add to slot data for poptracker

* Address concerns

* Address concerns

* Fix indentations

* Update option description

* Address all issues

* Group "or"s
sflavelle pushed a commit to sflavelle/Archipelago-tgc that referenced this pull request Jun 20, 2024
@chandler05 @sflavelle
A Short Hike: Add new options and option groups (ArchipelagoMW#3410)
65dc48e 
* A Short Hike: New options and stuff

* Add to slot data for poptracker

* Address concerns

* Address concerns

* Fix indentations

* Update option description

* Address all issues

* Group "or"s
qwint pushed a commit to qwint/Archipelago that referenced this pull request Jun 24, 2024
@chandler05 @qwint
A Short Hike: Add new options and option groups (ArchipelagoMW#3410)
3e966fa 
* A Short Hike: New options and stuff

* Add to slot data for poptracker

* Address concerns

* Address concerns

* Fix indentations

* Update option description

* Address all issues

* Group "or"s
AustinSumigray pushed a commit to AustinSumigray/Archipelago that referenced this pull request Jan 4, 2025
@chandler05 @AustinSumigray
A Short Hike: Add new options and option groups (ArchipelagoMW#3410)
618ddfd 
* A Short Hike: New options and stuff

* Add to slot data for poptracker

* Address concerns

* Address concerns

* Fix indentations

* Update option description

* Address all issues

* Group "or"s
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Exempt-Medic Exempt-Medic Exempt-Medic approved these changes

@NewSoupVi NewSoupVi NewSoupVi approved these changes

@Ixrec Ixrec Ixrec approved these changes

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chandler05 @Exempt-Medic @Ixrec @NewSoupVi