From e6c51589f4d31c832fc91364982ff2c13a0012f3 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 11 May 2022 14:35:44 -0500 Subject: [PATCH] Adding Special OW areas to spoiler log --- OverworldShuffle.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 4f391dc6..0ab55738 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -145,7 +145,7 @@ def link_overworld(world, player): update_world_regions(world, player) # update spoiler - s = list(map(lambda x: ' ' if x not in world.owswaps[player][0] else 'S', [i for i in range(0x40)])) + s = list(map(lambda x: ' ' if x not in world.owswaps[player][0] else 'S', [i for i in range(0x40, 0x82)])) text_output = tile_swap_spoiler_table.replace('s', '%s') % ( s[0x02], s[0x07], s[0x00], s[0x03], s[0x05], s[0x00], s[0x02],s[0x03], s[0x05], s[0x07], s[0x0a], s[0x0f], @@ -157,9 +157,9 @@ def link_overworld(world, player): s[0x30], s[0x32],s[0x33],s[0x34],s[0x35], s[0x37], s[0x22], s[0x25], s[0x3a],s[0x3b],s[0x3c], s[0x3f], s[0x28],s[0x29],s[0x2a],s[0x2b],s[0x2c],s[0x2d],s[0x2e],s[0x2f], - s[0x32],s[0x33],s[0x34], s[0x37], + s[0x40], s[0x32],s[0x33],s[0x34], s[0x37], s[0x30], s[0x35], - s[0x3a],s[0x3b],s[0x3c], s[0x3f]) + s[0x41], s[0x3a],s[0x3b],s[0x3c], s[0x3f]) world.spoiler.set_map('swaps', text_output, world.owswaps[player][0], player) # apply tile logical connections @@ -429,7 +429,7 @@ def link_overworld(world, player): # update spoiler new_spots = list(map(lambda o: flute_data[o][1], new_spots)) s = list(map(lambda x: ' ' if x not in new_spots else 'F', [i for i in range(0x40)])) - text_output = tile_swap_spoiler_table.replace('s', '%s') % ( s[0x02], s[0x07], + text_output = flute_spoiler_table.replace('s', '%s') % ( s[0x02], s[0x07], s[0x00], s[0x03], s[0x05], s[0x00], s[0x02],s[0x03], s[0x05], s[0x07], s[0x0a], s[0x0f], s[0x0a], s[0x0f], @@ -1807,6 +1807,26 @@ D(18)|s ss ss | +-+-+-+-+-+-+-+-+ E(20)| s s | D(18)| |s| |s| | F(28)|ssssssss| | s +-+ s +-+ s | G(30)|s ssss s| E(20)| |s| |s| | +H(38)| sss s| +-+-+-+-+-+-+-+-+ + +--------+ F(28)|s|s|s|s|s|s|s|s| + +-+ +-+-+-+-+-+-+-+-+ + Ped/Hobo: |s| G(30)| |s|s|s| |s| + +-+ | s +-+-+-+ s +-+ + Zora: |s| H(38)| |s|s|s| |s| + +-+ +---+-+-+-+---+-+""" + +flute_spoiler_table = \ +""" 0 1 2 3 4 5 6 7 + +---+-+---+---+-+ + 01234567 A(00)| |s| | |s| + +--------+ | s +-+ s | s +-+ +A(00)|s ss s s| B(08)| |s| | |s| +B(08)| s s| +-+-+-+-+-+-+-+-+ +C(10)|ssssssss| C(10)|s|s|s|s|s|s|s|s| +D(18)|s ss ss | +-+-+-+-+-+-+-+-+ +E(20)| s s | D(18)| |s| |s| | +F(28)|ssssssss| | s +-+ s +-+ s | +G(30)|s ssss s| E(20)| |s| |s| | H(38)| sss s| +-+-+-+-+-+-+-+-+ +--------+ F(28)|s|s|s|s|s|s|s|s| +-+-+-+-+-+-+-+-+