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

Merge branch 'DoorDevUnstable' into Synthesis

Browse Source 
# Conflicts:
#	Bosses.py
#	Main.py
#	Rom.py
#	data/base2current.bps
This commit is contained in:
aerinon
2022-08-11 15:43:33 -06:00
parent e167811d34 2ed0a80609
commit 1168273e43
6 changed files with 78 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Bosses.py
View File

@@ -223,12 +223,15 @@ def place_bosses(world, player):
for u, level in used_bosses:
if not level:
bosses.remove(u)
gt_bosses = []
for [loc, level] in boss_locations:
loc_text = loc + (' ('+level+')' if level else '')
try:
if level:
boss = random.choice([b for b in placeable_bosses if can_place_boss(world, player, b, loc, level)])
boss = random.choice([b for b in placeable_bosses if can_place_boss(world, player, b, loc, level)
and b not in gt_bosses])
gt_bosses.append(boss)
else:
boss = random.choice([b for b in bosses if can_place_boss(world, player, b, loc, level)])
bosses.remove(boss)