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

Aquaria: Adding Aquaria to README and some other minors changes #3313

Merged
merged 79 commits into from
May 20, 2024
Merged

Aquaria: Adding Aquaria to README and some other minors changes #3313

merged 79 commits into from
May 20, 2024

Conversation

tioui
Copy link
Collaborator

@tioui tioui commented May 17, 2024

What is this fixing or adding?

Adding the Aquaria game to the game list of the README file.

Also some English text changes of one Location, some option descriptions and a lots of documentation.

How was this tested?

I use Unit testing and generate games with every options.

tioui added 30 commits March 15, 2024 15:17
@tioui
Adding Aquaria game World
db79b19
@tioui
Merge branch 'main' of github.com:tioui/Archipelago
cf48369
@tioui
Aquaria version 0 alpha
061f1f9
@tioui
Adding a forgotten locations in the cathedral
7111a48
@tioui
Adding rules def
a1e73f9
@tioui
Forgot the Bedroom location
a8041e9
@tioui
Code refactoring
cfe2d56
@tioui
Massive code refactoring
5615872
@tioui
The boss is Mergog and not Mermog
2098f71
@tioui
Adding transportation turtle as Checks
5b59c0e
@tioui
Fixing options
a0dedc0
@tioui
Merge remote-tracking branch 'archipelago/main' into Adding-transport…
d42190f 
…ation-turtle-check
@tioui
Merging branches
b592ee0
@tioui
Merge branch 'main' of github.com:tioui/Archipelago
025dc3a
@tioui
Merge branch 'main' of github.com:ArchipelagoMW/Archipelago
1ae96ea
@tioui
Needing Li, sun and dual form for last boss
7de67c1
@tioui
Needing sun form for final boss
802743c
@tioui
Bind song also important for the final boss
0afe679
@tioui
Some merging bug fix
ccc4bc5
@tioui
Changing damage rules for crate for coherence
568435d
@tioui
Adding Bind song rules for bulb under a rock and Transturtle fix
3eeb302
@tioui
Fix duplicate Entrances
1a83f2e
@tioui
Manage the start items
c8cfeba
@tioui
Adding doc and options.
f71ec6d
@tioui
Add a location in easy exclusions
c96e1a8
@tioui
Continuing documentation
0572652
@tioui
Documentation and logic errors fix
6f16865
@tioui
Fixing some locations
e54eacf
@tioui
Location naming coherence
ca79153
@tioui
Using player random instead of multiworld random
2bb885b
@github-actions github-actions bot added the waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. label May 17, 2024
Exempt-Medic
Exempt-Medic approved these changes May 17, 2024
View reviewed changes
Copy link
Collaborator

@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 from Tioui LGTM (obviously my own do too). Tested by running Launcher and WebHost, unit tests and looking over it in PyCharm. Merged into main and ran 1500 random generations.

@Exempt-Medic Exempt-Medic added the is: enhancement Issues requesting new features or pull requests implementing new features. label May 17, 2024
remyjette
remyjette reviewed May 17, 2024
View reviewed changes
worlds/aquaria/Options.py Outdated Show resolved Hide resolved
worlds/aquaria/docs/setup_en.md Outdated Show resolved Hide resolved
worlds/aquaria/docs/setup_en.md Outdated Show resolved Hide resolved
nicholassaylor
nicholassaylor approved these changes May 19, 2024
View reviewed changes
Copy link
Contributor

@nicholassaylor nicholassaylor left a comment

Choose a reason for hiding this comment

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

LGTM, mostly minor formatting and text changes

@Zunawe Zunawe 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 May 20, 2024
@Berserker66 Berserker66 merged commit c792ae7 into ArchipelagoMW:main May 20, 2024
16 checks passed
jnschurig pushed a commit to Tranquilite0/Archipelago-SoulBlazer that referenced this pull request Jun 13, 2024
@tioui
Aquaria: Adding Aquaria to README and some other minors changes (Arch…
ec15664 
…ipelagoMW#3313)
sflavelle pushed a commit to sflavelle/Archipelago-tgc that referenced this pull request Jun 20, 2024
@tioui @sflavelle
Aquaria: Adding Aquaria to README and some other minors changes (Arch…
85405df 
…ipelagoMW#3313)
qwint pushed a commit to qwint/Archipelago that referenced this pull request Jun 24, 2024
@tioui @qwint
Aquaria: Adding Aquaria to README and some other minors changes (Arch…
c067311 
…ipelagoMW#3313)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@remyjette remyjette remyjette approved these changes

@Berserker66 Berserker66 Berserker66 approved these changes

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

@nicholassaylor nicholassaylor nicholassaylor 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.
6 participants
@tioui @remyjette @Berserker66 @Exempt-Medic @nicholassaylor @Zunawe