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

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

4
worlds/ror2/Regions.py
View File

@@ -1,6 +1,6 @@
from typing import Dict, List, NamedTuple, Optional
from BaseClasses import MultiWorld, Region, RegionType, Entrance
from BaseClasses import MultiWorld, Region, Entrance
from .Locations import location_table, RiskOfRainLocation
@@ -106,7 +106,7 @@ def create_regions(multiworld: MultiWorld, player: int):
def create_region(multiworld: MultiWorld, player: int, name: str, data: RoRRegionData):
region = Region(name, RegionType.Generic, name, player, multiworld)
region = Region(name, player, multiworld)
if data.locations:
for location_name in data.locations:
location_data = location_table.get(location_name)

4
worlds/ror2/__init__.py
View File

@@ -5,7 +5,7 @@ from .Locations import RiskOfRainLocation, get_classic_item_pickups, item_pickup
from .Rules import set_rules
from .RoR2Environments import *
from BaseClasses import Region, RegionType, Entrance, Item, ItemClassification, MultiWorld, Tutorial
from BaseClasses import Region, Entrance, Item, ItemClassification, MultiWorld, Tutorial
from .Options import ror2_options, ItemWeights
from worlds.AutoWorld import World, WebWorld
from .Regions import create_regions
@@ -256,7 +256,7 @@ def create_events(world: MultiWorld, player: int) -> None:
def create_region(world: MultiWorld, player: int, name: str, locations: Dict[str, int] = {}) -> Region:
ret = Region(name, RegionType.Generic, name, player, world)
ret = Region(name, player, world)
for location_name, location_id in locations.items():
ret.locations.append(RiskOfRainLocation(player, location_name, location_id, ret))
return ret