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 'espeon' into Archipelago_Main

Browse Source 
# Conflicts:
#	playerSettings.yaml
This commit is contained in:
Fabian Dill
2021-06-21 02:49:06 +02:00
parent 30190f373a b51b094cc1
commit 304f63aedf
11 changed files with 154 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Fill.py
View File

@@ -93,7 +93,7 @@ def distribute_items_restrictive(world: MultiWorld, gftower_trash=False, fill_lo
# fill in gtower locations with trash first
for player in world.alttp_player_ids:
if not gftower_trash or not world.ganonstower_vanilla[player] or \
world.logic[player] in {'owglitches', "nologic"}:
world.logic[player] in {'owglitches', 'hybridglitches', "nologic"}:
gtower_trash_count = 0
elif 'triforcehunt' in world.goal[player] and ('local' in world.goal[player] or world.players == 1):
gtower_trash_count = world.random.randint(world.crystals_needed_for_gt[player] * 2,