From 01ef041b86ecf218a65d68866730a311fd988499 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Thu, 1 Apr 2021 20:31:39 +0200 Subject: [PATCH] last minute fixing --- FactorioClient.py | 5 +++-- Main.py | 4 ++-- Mystery.py | 9 ++------- playerSettings.yaml | 2 +- setup.py | 3 ++- worlds/alttp/Rom.py | 5 ++++- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/FactorioClient.py b/FactorioClient.py index 232d7002..64b8cda3 100644 --- a/FactorioClient.py +++ b/FactorioClient.py @@ -152,8 +152,9 @@ async def factorio_server_watcher(ctx: FactorioContext): async def main(): ctx = FactorioContext(None, None, True) - ctx.server_address = "localhost" - ctx.auth = "Berserker" + # testing shortcuts + # ctx.server_address = "localhost" + # ctx.auth = "Nauvis" if ctx.server_task is None: ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop") await asyncio.sleep(3) diff --git a/Main.py b/Main.py index 25100e51..f9ff40b3 100644 --- a/Main.py +++ b/Main.py @@ -490,7 +490,7 @@ def main(args, seed=None): for future in roms: rom_name = future.result() rom_names.append(rom_name) - minimum_versions = {"server": (0, 0, 1)} + minimum_versions = {"server": (0, 0, 2)} connect_names = {base64.b64encode(rom_name).decode(): (team, slot) for slot, team, rom_name in rom_names} @@ -502,7 +502,7 @@ def main(args, seed=None): "connect_names": connect_names, "remote_items": {player for player in range(1, world.players + 1) if world.remote_items[player] or - world.game[player] != "Hollow Knight"}, + world.game[player] != "A Link to the Past"}, "locations": { (location.address, location.player): (location.item.code, location.item.player) diff --git a/Mystery.py b/Mystery.py index ffbcc2e1..b2a0cba6 100644 --- a/Mystery.py +++ b/Mystery.py @@ -582,13 +582,8 @@ def roll_alttp_settings(ret: argparse.Namespace, weights, plando_options): if not ret.shop_shuffle: ret.shop_shuffle = '' - ret.mode = get_choice('world_state', weights, None) # legacy support - if ret.mode == 'retro': - ret.mode = 'open' - ret.retro = True - elif ret.mode is None: - ret.mode = get_choice("mode", weights) - ret.retro = get_choice("retro", weights) + ret.mode = get_choice("mode", weights) + ret.retro = get_choice("retro", weights) ret.hints = get_choice('hints', weights) diff --git a/playerSettings.yaml b/playerSettings.yaml index a40cfe77..35e85aca 100644 --- a/playerSettings.yaml +++ b/playerSettings.yaml @@ -204,7 +204,7 @@ turtle_rock_medallion: # required medallion to open Turtle Rock front entrance boss_shuffle: none: 50 # Vanilla bosses basic: 0 # Existing bosses except Ganon and Agahnim are shuffled throughout dungeons - random: 0 # 3 bosses can occur twice + normal: 0 # 3 bosses can occur twice chaos: 0 # Any boss can appear any amount of times singularity: 0 # Picks a boss, tries to put it everywhere that works, if there's spaces remaining it picks a boss to fill those enemy_shuffle: # Randomize enemy placement diff --git a/setup.py b/setup.py index ca4b14fc..a4a3a135 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,8 @@ scripts = {"LttPClient.py": "ArchipelagoLttPClient", "MultiServer.py": "ArchipelagoServer", "gui.py": "ArchipelagoLttPCreator", "Mystery.py": "ArchipelagoMystery", - "LttPAdjuster.py": "ArchipelagoLttPAdjuster"} + "LttPAdjuster.py": "ArchipelagoLttPAdjuster", + "FactorioClient.py": "ArchipelagoFactorioClient"} exes = [] diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py index a6ef784b..57958e91 100644 --- a/worlds/alttp/Rom.py +++ b/worlds/alttp/Rom.py @@ -711,7 +711,10 @@ def patch_rom(world, rom, player, team, enemized): if location.item is not None: if location.item.game != "A Link to the Past": - itemid = 0x21 + if location.item.game == "Factorio": + itemid = 0x09 # Hammer Sprite + else: + itemid = 0x21 # Bug Catching Net # Keys in their native dungeon should use the orignal item code for keys elif location.parent_region.dungeon: if location.parent_region.dungeon.is_dungeon_item(location.item):