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

merge singularity and duality into one; under the singularity name

Browse Source
This commit is contained in:
Fabian Dill
2020-08-19 21:10:02 +02:00
parent e76887d0bf
commit c2e2c2d5f9
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Bosses.py
View File

@@ -238,23 +238,17 @@ def place_bosses(world, player: int):
place_boss(world, player, boss, loc, level)
elif world.boss_shuffle[player] == "singularity":
boss = world.random.choice(anywhere_bosses)
for loc, level in boss_locations:
place_boss(world, player, boss, loc, level)
elif world.boss_shuffle[player] == "duality":
# pick a boss that can only appear in some places
limited_boss = world.random.choice([boss for boss in placeable_bosses if boss not in anywhere_bosses])
primary_boss = world.random.choice(placeable_bosses)
remaining_boss_locations = []
for loc, level in boss_locations:
#place that boss where it can go
if can_place_boss(world, player, limited_boss, loc, level):
place_boss(world, player, limited_boss, loc, level)
# place that boss where it can go
if can_place_boss(world, player, primary_boss, loc, level):
place_boss(world, player, primary_boss, loc, level)
else:
remaining_boss_locations.append((loc, level))
#pick a boss to go into the remaining locations
remaining_boss = world.random.choice([boss for boss in placeable_bosses if all(
can_place_boss(world, player, boss, loc, level) for loc, level in remaining_boss_locations)])
for loc, level in remaining_boss_locations:
place_boss(world, player, remaining_boss, loc, level)
if remaining_boss_locations:
# pick a boss to go into the remaining locations
remaining_boss = world.random.choice([boss for boss in placeable_bosses if all(
can_place_boss(world, player, boss, loc, level) for loc, level in remaining_boss_locations)])
for loc, level in remaining_boss_locations:
place_boss(world, player, remaining_boss, loc, level)