Skip to content

Conversation

@tioui
Copy link
Collaborator

@tioui tioui commented Jun 14, 2024

What is this fixing or adding?

Some location names did was not consistent with all other location names. So those locations have been renamed.

There is also a new option, but it is useful only to the client. It does not impact the logic.

Also, I removed the DeathLink option to put it in the client.

How was this tested?

I have generate games with multiple options and have launched the unit tests. Every thing works with no problem.

@github-actions github-actions bot added the waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. label Jun 14, 2024
Copy link
Collaborator

@ScipioWright ScipioWright left a comment

Choose a reason for hiding this comment

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

Changes look reasonable. Did not check other location names for other names that could be renamed.

@ScipioWright ScipioWright added is: bug/fix Issues that are reporting bugs or pull requests that are fixing bugs. waiting-on: core-review Issue/PR has been peer-reviewed and is ready to be merged or needs input from a core maintainer. is: refactor/cleanup Improvements to code/output readability or organizization. and removed waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. labels Jun 14, 2024
Copy link
Contributor

@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.

LGTM, it generates, there are not other instances of these particular names in locations, just Cathedral right area being in regions.py, but that's fine

@NewSoupVi NewSoupVi removed the is: bug/fix Issues that are reporting bugs or pull requests that are fixing bugs. label Jun 15, 2024
@tioui
Copy link
Collaborator Author

tioui commented Jun 24, 2024

LGTM, it generates, there are not other instances of these particular names in locations, just Cathedral right area being in regions.py, but that's fine

Thanks. At first, I did not understand what you means. Then, I saw that I forgot to rename some Cathedral to Mithalas Cathedral.

@Berserker66
Copy link
Member

This also includes a new option, which isn't mentioned in the PR description.

@Exempt-Medic
Copy link
Contributor

My signal is bad, but I'm just stating here that I am revoking my approval. Several additional changes were made afterwards

@Exempt-Medic Exempt-Medic self-requested a review July 5, 2024 15:09
@tioui
Copy link
Collaborator Author

tioui commented Jul 5, 2024

This also includes a new option, which isn't mentioned in the PR description.

Oups. Sorry. The new option was add as a subsequent commit. So, I forgot to modify the description. But the option in question does not have any impact on the logic. It is just an information for the client. Also, I removed the DeathLink option after a discussion with @ScipioWright . This option is now activable/desactivable directly from the client.

@ScipioWright
Copy link
Collaborator

I think their message was more about "the scope of this PR has changed so I would need to re-review it to give approval again".
Generally, it's recommended to open a separate PR for separate changes, since that makes it easier to review and avoids situations like this.

@tioui
Copy link
Collaborator Author

tioui commented Jul 5, 2024

I think their message was more about "the scope of this PR has changed so I would need to re-review it to give approval again". Generally, it's recommended to open a separate PR for separate changes, since that makes it easier to review and avoids situations like this.

Will know next time.

Copy link
Collaborator

@ScipioWright ScipioWright left a comment

Choose a reason for hiding this comment

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

Reapproving so it's clear that I'm still fine with this

Copy link
Contributor

@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.

The changes LGTM. Can't test any generations for now, but presumably others did. fill_slot_data could be changed to use options.as_dict and some of the .value's could be removed, but that's outside the scope of this PR.

@tioui
Copy link
Collaborator Author

tioui commented Jul 5, 2024

The changes LGTM. Can't test any generations for now, but presumably others did. fill_slot_data could be changed to use options.as_dict and some of the .value's could be removed, but that's outside the scope of this PR.

For the fill_slot_data, I am not certain since I add some information in the slot data that are not in the options (ingredient and dishes randomization). For the .value, I will try removing them for a futur PR.

@NewSoupVi NewSoupVi merged commit 4054a9f into ArchipelagoMW:main Jul 5, 2024
AustinSumigray pushed a commit to AustinSumigray/Archipelago that referenced this pull request Jan 4, 2025
* Change 'The Body main area' by 'The Body center area' for consistency

* Renaming some locations for consistency

* Adding a line for standard

* Replacing Cathedral by Mithalas Cathedral and addin Blind goal option

* Client option renaming for consistency

* Fix death link not working

* Removing death link from the option to put it client side

* Changing Left to Right
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

is: refactor/cleanup Improvements to code/output readability or organizization. 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.

5 participants