From 7e314c0d7a58d6977689e9a7c7dbda1720db4c42 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Fri, 18 Mar 2022 18:19:21 +0100 Subject: [PATCH] Multidata: don't include start inventory events in sendable items (#319) --- Main.py | 2 +- worlds/hk/__init__.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Main.py b/Main.py index 0631af78..e8a9d647 100644 --- a/Main.py +++ b/Main.py @@ -335,7 +335,7 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No games[slot] = world.game[slot] slot_info[slot] = NetUtils.NetworkSlot(group["name"], world.game[slot], world.player_types[slot], group_members=sorted(group["players"])) - precollected_items = {player: [item.code for item in world_precollected] + precollected_items = {player: [item.code for item in world_precollected if type(item.code) == int] for player, world_precollected in world.precollected_items.items()} precollected_hints = {player: set() for player in range(1, world.players + 1 + len(world.groups))} diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py index 1826ba93..6cd251bb 100644 --- a/worlds/hk/__init__.py +++ b/worlds/hk/__init__.py @@ -1,5 +1,4 @@ import logging -from typing import Set logger = logging.getLogger("Hollow Knight") @@ -9,9 +8,10 @@ from .Regions import create_regions from .Rules import set_rules from .Options import hollow_knight_options -from BaseClasses import Region, Entrance, Location, MultiWorld, Item +from BaseClasses import Region, Entrance, Location, MultiWorld, Item, RegionType from ..AutoWorld import World, LogicMixin + class HKWorld(World): game: str = "Hollow Knight" options = hollow_knight_options @@ -87,7 +87,7 @@ class HKWorld(World): def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None): - ret = Region(name, None, name, player) + ret = Region(name, RegionType.Generic, name, player) ret.world = world if locations: for location in locations: @@ -105,14 +105,14 @@ class HKLocation(Location): game: str = "Hollow Knight" def __init__(self, player: int, name: str, address=None, parent=None): - super(HKLocation, self).__init__(player, name, address, parent) + super(HKLocation, self).__init__(player, name, address if address else None, parent) class HKItem(Item): game = "Hollow Knight" def __init__(self, name, advancement, code, type, player: int = None): - super(HKItem, self).__init__(name, advancement, code, player) + super(HKItem, self).__init__(name, advancement, code if code else None, player) self.type = type