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

Bumper Stickers and Meritous: Options and world: multiworld fixes (#3281)

Browse Source 
* Update Options.py

* Update __init__.py

* Correct case

* Correct case

* Update Meritous and actually use Options

* Oops

* Fixing world: multiworld
This commit is contained in:
Exempt-Medic
2024-05-12 12:52:34 -04:00
committed by GitHub
parent 701fbab837
commit f38655d6b6
6 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
worlds/meritous/Regions.py
View File

@@ -13,7 +13,7 @@ def _generate_entrances(player: int, entrance_list: [str], parent: Region):
return [Entrance(player, entrance, parent) for entrance in entrance_list]
def create_regions(world: MultiWorld, player: int):
def create_regions(multiworld: MultiWorld, player: int):
regions = ["First", "Second", "Third", "Last"]
bosses = ["Meridian", "Ataraxia", "Merodach"]
@@ -23,7 +23,7 @@ def create_regions(world: MultiWorld, player: int):
if x == 0:
insidename = "Menu"
region = Region(insidename, player, world)
region = Region(insidename, player, multiworld)
for store in ["Alpha Cache", "Beta Cache", "Gamma Cache", "Reward Chest"]:
for y in range(1, 7):
loc_name = f"{store} {(x * 6) + y}"
@@ -42,26 +42,26 @@ def create_regions(world: MultiWorld, player: int):
"Back to the entrance with the Knife"],
region)
world.regions += [region]
multiworld.regions += [region]
for x, boss in enumerate(bosses):
boss_region = Region(boss, player, world)
boss_region = Region(boss, player, multiworld)
boss_region.locations += [
MeritousLocation(player, boss, location_table[boss], boss_region),
MeritousLocation(player, f"{boss} Defeat", None, boss_region)
]
boss_region.exits = _generate_entrances(player, [f"To {regions[x + 1]} Quarter"], boss_region)
world.regions.append(boss_region)
multiworld.regions.append(boss_region)
region_final_boss = Region("Final Boss", player, world)
region_final_boss = Region("Final Boss", player, multiworld)
region_final_boss.locations += [MeritousLocation(
player, "Wervyn Anixil", None, region_final_boss)]
world.regions.append(region_final_boss)
multiworld.regions.append(region_final_boss)
region_tfb = Region("True Final Boss", player, world)
region_tfb = Region("True Final Boss", player, multiworld)
region_tfb.locations += [MeritousLocation(
player, "Wervyn Anixil?", None, region_tfb)]
world.regions.append(region_tfb)
multiworld.regions.append(region_tfb)
entrance_map = {
"To Meridian": {
@@ -103,6 +103,6 @@ def create_regions(world: MultiWorld, player: int):
for entrance in entrance_map:
connection_data = entrance_map[entrance]
connection = world.get_entrance(entrance, player)
connection = multiworld.get_entrance(entrance, player)
connection.access_rule = connection_data["rule"]
connection.connect(world.get_region(connection_data["to"], player))
connection.connect(multiworld.get_region(connection_data["to"], player))