morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: rip out RegionType and rework Region class (#814)

Browse Source
This commit is contained in:
alwaysintreble
2023-02-13 18:06:43 -06:00
committed by GitHub
parent f7a0542898
commit 7cbeb8438b
48 changed files with 1324 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
worlds/meritous/Regions.py
View File

@@ -3,7 +3,7 @@
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
from BaseClasses import MultiWorld, Region, Entrance, RegionType
from BaseClasses import MultiWorld, Region, Entrance
from .Locations import MeritousLocation, location_table
meritous_regions = ["Meridian", "Ataraxia", "Merodach", "Endgame"]
@@ -23,7 +23,7 @@ def create_regions(world: MultiWorld, player: int):
if x == 0:
insidename = "Menu"
region = Region(insidename, RegionType.Generic, fullname, player, world)
region = Region(insidename, player, world)
for store in ["Alpha Cache", "Beta Cache", "Gamma Cache", "Reward Chest"]:
for y in range(1, 7):
loc_name = f"{store} {(x * 6) + y}"
@@ -45,7 +45,7 @@ def create_regions(world: MultiWorld, player: int):
world.regions += [region]
for x, boss in enumerate(bosses):
boss_region = Region(boss, RegionType.Generic, boss, player, world)
boss_region = Region(boss, player, world)
boss_region.locations += [
MeritousLocation(player, boss, location_table[boss], boss_region),
MeritousLocation(player, f"{boss} Defeat", None, boss_region)
@@ -53,14 +53,12 @@ def create_regions(world: MultiWorld, player: int):
boss_region.exits = _generate_entrances(player, [f"To {regions[x + 1]} Quarter"], boss_region)
world.regions.append(boss_region)
region_final_boss = Region(
"Final Boss", RegionType.Generic, "Final Boss", player, world)
region_final_boss = Region("Final Boss", player, world)
region_final_boss.locations = [MeritousLocation(
player, "Wervyn Anixil", None, region_final_boss)]
world.regions.append(region_final_boss)
region_tfb = Region("True Final Boss", RegionType.Generic,
"True Final Boss", player, world)
region_tfb = Region("True Final Boss", player, world)
region_tfb.locations = [MeritousLocation(
player, "Wervyn Anixil?", None, region_tfb)]
world.regions.append(region_tfb)