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

The Witness: Allow specifying custom trap weights #2835

Merged
merged 9 commits into from
Feb 29, 2024

Conversation

NewSoupVi
Copy link
Member

@NewSoupVi NewSoupVi commented Feb 16, 2024

  trap_weights:
    Bonk: 20
    Power Surge: 0
    Slowness: 0

:)
Decided to make this an options dict, I really don't like having one option per trap, it's just so much bloat

Tested:
Just genned & debugged some stuff

This did also necessitate moving the initialisation of the Static classes to their respective files.
At some point soon, I should just change these to be submodules and get rid of the notion of the "static class"
Definitely got too many refactoring PRs open right now to wanna do sth that invasive though

@github-actions github-actions bot added the waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. label Feb 16, 2024
@NewSoupVi NewSoupVi added the is: enhancement Issues requesting new features or pull requests implementing new features. label Feb 16, 2024
Copy link
Collaborator

@hatkirby hatkirby left a comment

Choose a reason for hiding this comment

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

Code LGTM.

Copy link
Member

@Exempt-Medic Exempt-Medic left a comment

Choose a reason for hiding this comment

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

Three small comments for right now, will do more testing later

worlds/witness/items.py Outdated Show resolved Hide resolved
worlds/witness/items.py Outdated Show resolved Hide resolved
worlds/witness/__init__.py Show resolved Hide resolved
Copy link
Member

@Exempt-Medic Exempt-Medic left a comment

Choose a reason for hiding this comment

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

Code LGTM. Compared generations with and without the changes. Did some test generations to check if weights worked properly and checked that improper formatting lead to (useful) errors. Booted up a game and received a trap item just in case that somehow mattered

@NewSoupVi NewSoupVi 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 Feb 21, 2024
@Berserker66 Berserker66 merged commit 564ec8c into ArchipelagoMW:main Feb 29, 2024
15 checks passed
@github-actions github-actions bot removed the waiting-on: core-review Issue/PR has been peer-reviewed and is ready to be merged or needs input from a core maintainer. label Feb 29, 2024
TheLX5 pushed a commit to TheLX5/Archipelago that referenced this pull request Mar 2, 2024
* Trap weights

* Slightly change the way the option works

* Wording one more time

* Non optional to bring in line with Ixrec's implementation

* Be clear that it's not an absolute amount, but a weight

* E x c l a m a t i o n   p o i n t

* Update worlds/witness/items.py

Co-authored-by: Exempt-Medic <[email protected]>

* Wait I can just do this now lol

---------

Co-authored-by: Exempt-Medic <[email protected]>
TheLX5 pushed a commit to TheLX5/Archipelago that referenced this pull request Mar 2, 2024
* Trap weights

* Slightly change the way the option works

* Wording one more time

* Non optional to bring in line with Ixrec's implementation

* Be clear that it's not an absolute amount, but a weight

* E x c l a m a t i o n   p o i n t

* Update worlds/witness/items.py

Co-authored-by: Exempt-Medic <[email protected]>

* Wait I can just do this now lol

---------

Co-authored-by: Exempt-Medic <[email protected]>
EmilyV99 pushed a commit to EmilyV99/Archipelago that referenced this pull request Apr 15, 2024
* Trap weights

* Slightly change the way the option works

* Wording one more time

* Non optional to bring in line with Ixrec's implementation

* Be clear that it's not an absolute amount, but a weight

* E x c l a m a t i o n   p o i n t

* Update worlds/witness/items.py

Co-authored-by: Exempt-Medic <[email protected]>

* Wait I can just do this now lol

---------

Co-authored-by: Exempt-Medic <[email protected]>
EmilyV99 pushed a commit to EmilyV99/Archipelago that referenced this pull request Apr 15, 2024
* Trap weights

* Slightly change the way the option works

* Wording one more time

* Non optional to bring in line with Ixrec's implementation

* Be clear that it's not an absolute amount, but a weight

* E x c l a m a t i o n   p o i n t

* Update worlds/witness/items.py

Co-authored-by: Exempt-Medic <[email protected]>

* Wait I can just do this now lol

---------

Co-authored-by: Exempt-Medic <[email protected]>
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants