From fd888d9e31473b2c5e91e02c79ccd73bd76673c3 Mon Sep 17 00:00:00 2001 From: Edos512 <30857677+Edos512@users.noreply.github.com> Date: Wed, 13 Jan 2021 22:35:49 +0100 Subject: [PATCH 1/3] Update MSU spanish tutorial (#161) Added Stream-safe MSU packs section --- WebHostLib/static/assets/tutorial/zelda3/msu1_es.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/WebHostLib/static/assets/tutorial/zelda3/msu1_es.md b/WebHostLib/static/assets/tutorial/zelda3/msu1_es.md index 8e3c0e12..b815ba27 100644 --- a/WebHostLib/static/assets/tutorial/zelda3/msu1_es.md +++ b/WebHostLib/static/assets/tutorial/zelda3/msu1_es.md @@ -65,3 +65,10 @@ alttp_msu-34.pcm Muchos packs MSU usan música con derechos de autor la cual no esta permitido su uso en plataformas como Twitch o YouTube. Si elijes hacer stream de dicha música, tu VOD puede ser silenciado. En el peor caso, puedes recibir una orden de eliminación DMCA. Por favor, tened cuidado y solo streamear música para la cual tengas los derechos para hacerlo. + +##### Packs MSU seguros para Stream +A continuación enumeramos los packs MSU que, packs which, por lo que sabemos, son seguros para vuestras retransmisiones. Se iran añadiendo mas conforme +vayamos enterandonos. Si sabes alguno que podamos haber olvidado, por favor haznoslo saber! +- Musica del juego original +- [Smooth McGroove](https://drive.google.com/open?id=1JDa1jCKg5hG0Km6xNpmIgf4kDMOxVp3n) + From 5afe44f9cbe31658f54f25487c3b0ecb210d8f01 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Fri, 15 Jan 2021 03:22:56 +0100 Subject: [PATCH 2/3] use multidata locations to get missing checks (in server) --- MultiServer.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/MultiServer.py b/MultiServer.py index 6586fd15..011fca9a 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -964,20 +964,19 @@ class ClientMessageProcessor(CommonCommandProcessor): self.output(response) return False + def get_missing_checks(ctx: Context, client: Client) -> list: - locations = [] - #for location_id in [k[0] for k, v in ctx.locations if k[1] == client.slot]: - # if location_id not in ctx.location_checks[client.team, client.slot]: - # locations.append(Regions.lookup_id_to_name.get(location_id, f'Unknown Location ID: {location_id}')) - for location_id, location_name in Regions.lookup_id_to_name.items(): # cheat console is -1, keep in mind - if location_id != -1 and location_id not in ctx.location_checks[client.team, client.slot] and (location_id, client.slot) in ctx.locations: - locations.append(location_name) - return locations + return [Regions.lookup_id_to_name.get(location_id, f'Unknown Location ID: {location_id}') for + location_id, slot in ctx.locations if + slot == client.slot and + location_id not in ctx.location_checks[client.team, client.slot]] + def get_client_points(ctx: Context, client: Client) -> int: return (ctx.location_check_points * len(ctx.location_checks[client.team, client.slot]) - ctx.hint_cost * ctx.hints_used[client.team, client.slot]) + async def process_client_cmd(ctx: Context, client: Client, cmd, args): if type(cmd) is not str: await ctx.send_msgs(client, [['InvalidCmd']]) From 6427d246a223f811b184e23c161b05ac88fddfaa Mon Sep 17 00:00:00 2001 From: CaitSith2 Date: Fri, 15 Jan 2021 01:32:51 -0800 Subject: [PATCH 3/3] Fix Take-Any caves being non deterministic --- ItemPool.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ItemPool.py b/ItemPool.py index 6e9462a9..d27461a2 100644 --- a/ItemPool.py +++ b/ItemPool.py @@ -526,10 +526,11 @@ take_any_locations = { def set_up_take_anys(world, player): + take_any_locs = take_any_locations if world.mode[player] == 'inverted': - take_any_locs = take_any_locations - {"Dark Sanctuary Hint", "Archery Game"} - else: - take_any_locs = take_any_locations + take_any_locs -= {"Dark Sanctuary Hint", "Archery Game"} + take_any_locs = list(take_any_locs) + take_any_locs.sort() regions = world.random.sample(take_any_locs, 5)