Skip to content

Added randomized pricing settings, and moved the item pool to enable …#1

Merged
jeromkiller merged 1 commit intosohfrom
ShopShuffle
Oct 14, 2025
Merged

Added randomized pricing settings, and moved the item pool to enable …#1
jeromkiller merged 1 commit intosohfrom
ShopShuffle

Conversation

@jeromkiller
Copy link
Owner

No description provided.

…creating a pre-fill state for vanilla shop item placement
@jeromkiller jeromkiller merged commit 921a9c6 into soh Oct 14, 2025
10 of 24 checks passed
@jeromkiller jeromkiller deleted the ShopShuffle branch October 14, 2025 19:04
jeromkiller added a commit that referenced this pull request Nov 7, 2025
* Fix progressive bombchu bag

* Add descriptive comment so this doesn't happen again

* Update Items.py

* Fixes as per aMannus review

* Oops

* Make Epona just an event item

* Attempt to prefill dungeon rewards before shops

* Revert "Attempt to prefill dungeon rewards before shops"

This reverts commit 7cafd11.

* Fix dungeon rewards prefill hopefully for real this time

* Remove unused helpers

* Minor fixes

* change display name

* Fix minor issues

* Swap to StrEnum

* Swap to modern typing

* Fix remove

* Fix a bunch of broken locations

* Fix overfilling item pool

* More logic fixes

* Move filler item pool to after prefills

* Update __init__.py

* Fix missing has_item for bombchu bowling

* Fix shop items and wallets

* Revert "Move filler item pool to after prefills"

This reverts commit 2a0fa4c.

* Add missing option groups

* Fix more broken locations

* Minor changes around slot data

* Fix can buy item strings and shuffle shop descriptions

* Add tests for collect and remove

* Update comment

* Make it also check that you don't erroneously have the next rank

* Remove Unused DMC_VOLCANO_VENT

Exclude HC_GARDEN from regions when skip_child_zelda option is enabled.

* Commented out MQ regions from Regions class.

* Implement min/max shop price options

* Implement randomized scrub prices

* Create archipelago.json

* Apply pep8 code styling to entire apworld

* Add protection against too many triforce pieces

* Shorten subtraction

* All locations sending correctly in Ship!

* Rescued

* Update to what we talked about over discord

* fix my dumbness

* Add rounding to the Triforce Hunt Completion Event Calc

Update Some stray strings to the Enum equivilent

* do the thing

* requested changes

* Move pre_fill stuff to create_items

* Make Jabu Jabus Belly Boss Exit accessible

* Fix some stuff that should've been changed to enums

* Change the rest of the ones in this file to enums too cause why not

* requested change and some cleanup

* forgot to actually update the total option

* Comment out Jabu

* Remove debug print

* Fix missing ocarina requirement

* Comment out a MQ location that shouldn't have been there

* Comment out another MQ location that shouldn't have been there

* testing

* LLR Lon Lon Ranch GS Tree

* more testing

* Pass apworld version in with slot data

* Fix triforce pieces

* Fix triforce pieces

* Why the hell is this the fix

* presets

* Fix errors

* hopefully final fixes

* update ocarina

* Various minor item pool fixes

* Change to using pre-fill again

* Revert "Various minor item pool fixes"

This reverts commit edca351.

* Fix item pool maybe for real now

* Re-order init.py and add get_pre_fill_items

* Add shop items to the pre_fill_items

* Move triforce piece creation and filler items to create_items

* Fix shop item count

* Update Preset Names

* Make pre_fill faster

* LLR GS Tree broke

* Comment out visualize_regions

* Reorganize init

* Fix can_play_song and skip epona race name

* Put in good UT support

* Remove unused import

* Fix item_group_count

* Fix can_play_song

* Put placeholder in for tricks_in_logic

* Rename ut_stuff.py to UniversalTracker.py

* Update __init__.py

* Remove comment

* Fix master sword issue with starting age as adult

* Push version number

* Implement get_filler_item_name

* Remove debug thing

* this sucks but it works I guess

* Scrub Option text

* add missing logic

* this sucks but it works I guess

* Fix connection in forest temple

* Remove bombchu bag as a progressive item

* Remove age exclusive checks

* Remove legacy Ages.BOTH enum and instances

* Fix and simplify bombchu helpers

* Update version

* Make dungeon rewards and vanilla shop items random

* Fix for King Dodongo Fight logic

* Fix shop item price rules

* Version to 0.0.4

* Fix minor issue in the connection between ZD and LH

* Update Castle Entryway connection

* add parenthesis

* Add unit test

* Add unit test as a double check

* Make item names strings

* Add location_name_groups to init

* Add location_name_groups

* Add Boss Souls item group

* True no logic option

* Test that age rules work

* Add the no logic-only locations

* Remove the .values from Locations.py

* Also add it to the UT thing

* Optimize bottle_count since it's only used once

* Rename bottle_count to has_bottle_count

* Don't calculate early in has_projectile

* Just directly use has_projectile for can_use_projectile

* Remove unused variable assignments, clean up can_standing_shield

* Flip check in can_get_nighttime_gs to early out on a quicker to calculate part

* More misc cleanup

* Remove unused function, can_hit_switch

* Remove unnecessary arg from can_hit_at_range in can_kill_enemy

* Use can_use_any a lot in can_kill_enemy

* Make has_boss_soul shorter

* Clean up can_pass_enemy

* Use a dictionary for has_key_ring instead of an if tree

* More cleanup

* Cache hearts

* Remove the old version that was commented out

* Remove unused imports

* Final cleanup

* Further simplify small_keys

* Make skulls depriority

* Remove piece of heart from heart count function

* Remove pieces of heart from heart test

* Remove pieces of heart from logic helpers

* Pull the heart stuff out

* Heart stuff

* Added can_reach override to SohLocation to differentiate between child and adult reachable locations

* Add settings name to description

* Update check for no logic locations to include checking if trees and crates are actually enabled

* Resolve LogicHelper.py errors and remove can_live

* Add back tree that was removed by accident

* Revert age specific skulls

* Fix graveyard gossip stone fairy rule

* update deku torch room to water back

* Deku Tree Entrance

* Fix deku theater GS rule

* Update test_time.py

* Update Locations.py

* I had one job (fix parenths)

* Fix location name group

* Add switch event

* Update version to 0.0.5

* Minor default option changes

* Implement time of day events

* Fix zora's river grass logic

* Fix sun check logic

* Prepare readme

* Small update to the setup guide

* More minor doc changes

* Added credits to readme

* Formatting changes

* Forever reformat

* Ice cavern refactor

* Fixes

* Update doc links to new fork

* Format ice cavern and fix KOKIRI_SHIELD -> DEKU_SHIELD

* Update version to 1.0.0

* Add slingshot ammo to filler items

---------

Co-authored-by: Scipio Wright <[email protected]>
Co-authored-by: Tzuf <[email protected]>
Co-authored-by: Hunter Marshall <[email protected]>
Co-authored-by: BootsinSoots <[email protected]>
Co-authored-by: mattman107 <[email protected]>
Co-authored-by: Tzuf <[email protected]>
Co-authored-by: Jerom Venneker <[email protected]>
Co-authored-by: Eric Hoey <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant