monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multidata: don't include start inventory events in sendable items (#319)

This commit is contained in:
Fabian Dill 2022-03-18 18:19:21 +01:00 committed by GitHub
parent 1266ca314c
commit 7e314c0d7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Main.py
View File

@ -335,7 +335,7 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
games[slot] = world.game[slot] games[slot] = world.game[slot]
slot_info[slot] = NetUtils.NetworkSlot(group["name"], world.game[slot], world.player_types[slot], slot_info[slot] = NetUtils.NetworkSlot(group["name"], world.game[slot], world.player_types[slot],
group_members=sorted(group["players"])) 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()} for player, world_precollected in world.precollected_items.items()}
precollected_hints = {player: set() for player in range(1, world.players + 1 + len(world.groups))} precollected_hints = {player: set() for player in range(1, world.players + 1 + len(world.groups))}

10
worlds/hk/__init__.py
View File

@ -1,5 +1,4 @@
import logging import logging
from typing import Set
logger = logging.getLogger("Hollow Knight") logger = logging.getLogger("Hollow Knight")
@ -9,9 +8,10 @@ from .Regions import create_regions
from .Rules import set_rules from .Rules import set_rules
from .Options import hollow_knight_options 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 from ..AutoWorld import World, LogicMixin
class HKWorld(World): class HKWorld(World):
game: str = "Hollow Knight" game: str = "Hollow Knight"
options = hollow_knight_options options = hollow_knight_options
@ -87,7 +87,7 @@ class HKWorld(World):
def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None): 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 ret.world = world
if locations: if locations:
for location in locations: for location in locations:
@ -105,14 +105,14 @@ class HKLocation(Location):
game: str = "Hollow Knight" game: str = "Hollow Knight"
def __init__(self, player: int, name: str, address=None, parent=None): 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): class HKItem(Item):
game = "Hollow Knight" game = "Hollow Knight"
def __init__(self, name, advancement, code, type, player: int = None): 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 self.type = type