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

MultiServer: delete unused function

This commit is contained in:
Fabian Dill 2022-01-28 09:29:29 +01:00
parent dd61d0d395
commit 25dd89ed17
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Fill.py
View File

@ -167,7 +167,7 @@ def distribute_items_restrictive(world: MultiWorld):
if progitempool: if progitempool:
fill_restrictive(world, world.state, defaultlocations, progitempool) fill_restrictive(world, world.state, defaultlocations, progitempool)
if(len(progitempool) > 0): if progitempool:
raise FillError( raise FillError(
f'Not enough locations for progress items. There are {len(progitempool)} more items than locations') f'Not enough locations for progress items. There are {len(progitempool)} more items than locations')
@ -176,7 +176,7 @@ def distribute_items_restrictive(world: MultiWorld):
# needs logical fill to not conflict with local items # needs logical fill to not conflict with local items
nonexcludeditempool, defaultlocations = fast_fill( nonexcludeditempool, defaultlocations = fast_fill(
world, nonexcludeditempool, defaultlocations) world, nonexcludeditempool, defaultlocations)
if(len(nonexcludeditempool) > 0): if nonexcludeditempool:
raise FillError( raise FillError(
f'Not enough locations for non-excluded items. There are {len(nonexcludeditempool)} more items than locations') f'Not enough locations for non-excluded items. There are {len(nonexcludeditempool)} more items than locations')

5
MultiServer.py
View File

@ -734,11 +734,6 @@ def register_location_checks(ctx: Context, team: int, slot: int, locations: typi
ctx.save() ctx.save()
def notify_team(ctx: Context, team: int, text: str):
logging.info("Notice (Team #%d): %s" % (team + 1, text))
ctx.broadcast_team(team, [['Print', {"text": text}]])
def collect_hints(ctx: Context, team: int, slot: int, item: str) -> typing.List[NetUtils.Hint]: def collect_hints(ctx: Context, team: int, slot: int, item: str) -> typing.List[NetUtils.Hint]:
hints = [] hints = []
seeked_item_id = proxy_worlds[ctx.games[slot]].item_name_to_id[item] seeked_item_id = proxy_worlds[ctx.games[slot]].item_name_to_id[item]

2
SNIClient.py
View File

@ -190,7 +190,7 @@ async def deathlink_kill_player(ctx: Context):
snes_buffered_write(ctx, WRAM_START + 0x09D6, bytes([0, 0])) # set current reserve to 0 snes_buffered_write(ctx, WRAM_START + 0x09D6, bytes([0, 0])) # set current reserve to 0
await snes_flush_writes(ctx) await snes_flush_writes(ctx)
await asyncio.sleep(1) await asyncio.sleep(1)
gamemode = None
if ctx.game == GAME_ALTTP: if ctx.game == GAME_ALTTP:
gamemode = await snes_read(ctx, WRAM_START + 0x10, 1) gamemode = await snes_read(ctx, WRAM_START + 0x10, 1)
if not gamemode or gamemode[0] in DEATH_MODES: if not gamemode or gamemode[0] in DEATH_MODES: