morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into breaking_changes

Browse Source 
# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py
This commit is contained in:
Fabian Dill
2021-02-21 20:15:07 +01:00
parent 96dfccdbfc a8bace554e
commit dcce53f8c8
23 changed files with 424 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Fill.py
View File

@@ -359,7 +359,7 @@ def swap_location_item(location_1: Location, location_2: Location, check_locked=
def distribute_planned(world):
world_name_lookup = {world.player_names[player_id][0]: player_id for player_id in world.player_ids}
world_name_lookup = world.world_name_lookup
for player in world.player_ids:
placement: PlandoItem