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

5
worlds/zillion/__init__.py
View File

@@ -7,8 +7,7 @@ import os
import logging
from BaseClasses import ItemClassification, LocationProgressType, \
MultiWorld, Item, CollectionState, RegionType, \
Entrance, Tutorial
MultiWorld, Item, CollectionState, Entrance, Tutorial
from Options import AssembleOptions
from .logic import cs_to_zz_locs
from .region import ZillionLocation, ZillionRegion
@@ -155,7 +154,7 @@ class ZillionWorld(World):
all: Dict[str, ZillionRegion] = {}
for here_zz_name, zz_r in self.zz_system.randomizer.regions.items():
here_name = "Menu" if here_zz_name == "start" else zz_reg_name_to_reg_name(here_zz_name)
all[here_name] = ZillionRegion(zz_r, here_name, RegionType.Generic, here_name, p, w)
all[here_name] = ZillionRegion(zz_r, here_name, here_name, p, w)
self.multiworld.regions.append(all[here_name])
limited_skill = Req(gun=3, jump=3, skill=self.zz_system.randomizer.options.skill, hp=940, red=1, floppy=126)

10
worlds/zillion/region.py
View File

@@ -1,5 +1,5 @@
from typing import Optional
from BaseClasses import MultiWorld, Region, RegionType, Location, Item, CollectionState
from BaseClasses import MultiWorld, Region, Location, Item, CollectionState
from zilliandomizer.logic_components.regions import Region as ZzRegion
from zilliandomizer.logic_components.locations import Location as ZzLocation
from zilliandomizer.logic_components.items import RESCUE
@@ -11,14 +11,12 @@ from .item import ZillionItem
class ZillionRegion(Region):
zz_r: ZzRegion
def __init__(self,
zz_r: ZzRegion,
def __init__(self, zz_r: ZzRegion,
name: str,
type_: RegionType,
hint: str,
player: int,
world: Optional[MultiWorld] = None) -> None:
super().__init__(name, type_, hint, player, world)
multiworld: Optional[MultiWorld] = None) -> None:
super().__init__(name, player, multiworld, hint)
self.zz_r = zz_r