alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'OverworldShuffleDev' into OverworldShuffle

Browse Source
This commit is contained in:
codemann8
2025-12-07 00:02:03 -06:00
parent 6bb7921a01 159e7e3785
commit 382a22dd2f
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,5 +1,8 @@
# Changelog # Changelog
## 0.6.1.5
- Fixed error with non-prize shuffle
## 0.6.1.4 ## 0.6.1.4
- Fixes for Glitched Rain State (Bonk Shuffle included) - Fixes for Glitched Rain State (Bonk Shuffle included)
- \~Merged in DR v1.5.0~ - \~Merged in DR v1.5.0~

2
Fill.py
View File

@@ -183,7 +183,7 @@ def fill_restrictive(world, base_state, locations, itempool, key_pool=None, sing
spot_to_fill = None spot_to_fill = None
item_locations = filter_locations(item_to_place, locations, world, vanilla) item_locations = filter_locations(item_to_place, locations, world, vanilla)
if is_dungeon_item(item_to_place, world): if is_dungeon_item(item_to_place, world) and not (item_to_place.prize and world.prizeshuffle[item_to_place.player] == 'none'):
item_locations = [l for l in item_locations if valid_dungeon_placement(item_to_place, l, world)] item_locations = [l for l in item_locations if valid_dungeon_placement(item_to_place, l, world)]
verify(item_to_place, item_locations, maximum_exploration_state, single_player_placement, verify(item_to_place, item_locations, maximum_exploration_state, single_player_placement,
perform_access_check, key_pool, world) perform_access_check, key_pool, world)

2
OverworldShuffle.py
View File

@@ -8,7 +8,7 @@ from OWEdges import OWTileRegions, OWEdgeGroups, OWEdgeGroupsTerrain, OWExitType
from OverworldGlitchRules import create_owg_connections from OverworldGlitchRules import create_owg_connections
from Utils import bidict from Utils import bidict
version_number = '0.6.1.4' version_number = '0.6.1.5'
# branch indicator is intentionally different across branches # branch indicator is intentionally different across branches
version_branch = '' version_branch = ''