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 Messenger: Add Shop Rando #1834

Merged
merged 37 commits into from
Jun 27, 2023
Merged

Conversation

alwaysintreble
Copy link
Collaborator

@alwaysintreble alwaysintreble commented May 23, 2023

What is this fixing or adding?

Shuffles the shop upgrades into the itempool and adds options to customize the pricing of shop and figurine purchases. Also makes quite a lot of changes to the logic to make normal logic a bit easier and hard logic a bit harder. Hard mode being harder made challenge logic nearly worthless so scrapped it.

How was this tested?

Unit tests and tons of client testing.

@ThePhar ThePhar added the is: enhancement Issues requesting new features or pull requests implementing new features. label May 31, 2023
# Conflicts:
#	worlds/messenger/Options.py
Copy link
Collaborator

@el-u el-u left a comment

Choose a reason for hiding this comment

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

Some minor stuff

worlds/messenger/Constants.py Outdated Show resolved Hide resolved
worlds/messenger/Regions.py Outdated Show resolved Hide resolved
worlds/messenger/Rules.py Outdated Show resolved Hide resolved
worlds/messenger/Shop.py Outdated Show resolved Hide resolved
worlds/messenger/Shop.py Show resolved Hide resolved
worlds/messenger/test/TestLogic.py Outdated Show resolved Hide resolved
worlds/messenger/__init__.py Outdated Show resolved Hide resolved
worlds/messenger/Options.py Outdated Show resolved Hide resolved
worlds/messenger/Rules.py Show resolved Hide resolved
worlds/messenger/SubClasses.py Outdated Show resolved Hide resolved
worlds/messenger/SubClasses.py Outdated Show resolved Hide resolved
worlds/messenger/__init__.py Outdated Show resolved Hide resolved
@black-sliver black-sliver merged commit 332eab9 into ArchipelagoMW:main Jun 27, 2023
@alwaysintreble alwaysintreble deleted the shops branch July 19, 2023 21:46
FlySniper pushed a commit to FlySniper/Archipelago that referenced this pull request Nov 14, 2023
* add shop shuffle options and items

* add logic for the shop slots

* write cost tests

* start on shop item logic

* make strike and second wind early items

* some cleanup

* remove 5 shards

* double cost requirement for really expensive items and raise the rates

* add test for shop shuffle with minimum other locations

* put power seal in front of shards

* rename locations and items

* update rules, regions, and shop

* update tests and misc fixes

* minor cleanup

* implement money wrench and figurines

* clean out now unneeded info from slot_data

* docs update and fix a failure when not shuffling shops

* remove shop shuffle option

* Finish out shop rules

* make seals generation easier to read and fix tests

* rule adjustments

* oop

* adjust the prices to be a bit more generous

* add max price to slot data for tracker

* update the hard rules a bit

* remove unnecessary test

* update data_version

* bump version and remove info for fixed issues

* remove now unneeded assert

* review updates

* minor bug fix

* add a test for minimum locations shop costing

* minor optimizations and cleanup

* remove whitespace
Jouramie pushed a commit to Jouramie/Archipelago that referenced this pull request Feb 28, 2024
* add shop shuffle options and items

* add logic for the shop slots

* write cost tests

* start on shop item logic

* make strike and second wind early items

* some cleanup

* remove 5 shards

* double cost requirement for really expensive items and raise the rates

* add test for shop shuffle with minimum other locations

* put power seal in front of shards

* rename locations and items

* update rules, regions, and shop

* update tests and misc fixes

* minor cleanup

* implement money wrench and figurines

* clean out now unneeded info from slot_data

* docs update and fix a failure when not shuffling shops

* remove shop shuffle option

* Finish out shop rules

* make seals generation easier to read and fix tests

* rule adjustments

* oop

* adjust the prices to be a bit more generous

* add max price to slot data for tracker

* update the hard rules a bit

* remove unnecessary test

* update data_version

* bump version and remove info for fixed issues

* remove now unneeded assert

* review updates

* minor bug fix

* add a test for minimum locations shop costing

* minor optimizations and cleanup

* remove whitespace
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