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

TLOZ: Use the proper location name lookup (#2529)

This commit is contained in:
t3hf1gm3nt 2023-11-29 01:19:42 -05:00 committed by GitHub
parent 39969abd6a
commit 6c5f8250fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zelda1Client.py
View File

@ -13,7 +13,6 @@ from typing import List
import Utils import Utils
from Utils import async_start from Utils import async_start
from worlds import lookup_any_location_id_to_name
from CommonClient import CommonContext, server_loop, gui_enabled, console_loop, ClientCommandProcessor, logger, \ from CommonClient import CommonContext, server_loop, gui_enabled, console_loop, ClientCommandProcessor, logger, \
get_base_parser get_base_parser
@ -153,7 +152,7 @@ def get_payload(ctx: ZeldaContext):
def reconcile_shops(ctx: ZeldaContext): def reconcile_shops(ctx: ZeldaContext):
checked_location_names = [lookup_any_location_id_to_name[location] for location in ctx.checked_locations] checked_location_names = [ctx.location_names[location] for location in ctx.checked_locations]
shops = [location for location in checked_location_names if "Shop" in location] shops = [location for location in checked_location_names if "Shop" in location]
left_slots = [shop for shop in shops if "Left" in shop] left_slots = [shop for shop in shops if "Left" in shop]
middle_slots = [shop for shop in shops if "Middle" in shop] middle_slots = [shop for shop in shops if "Middle" in shop]
@ -191,7 +190,7 @@ async def parse_locations(locations_array, ctx: ZeldaContext, force: bool, zone=
locations_checked = [] locations_checked = []
location = None location = None
for location in ctx.missing_locations: for location in ctx.missing_locations:
location_name = lookup_any_location_id_to_name[location] location_name = ctx.location_names[location]
if location_name in Locations.overworld_locations and zone == "overworld": if location_name in Locations.overworld_locations and zone == "overworld":
status = locations_array[Locations.major_location_offsets[location_name]] status = locations_array[Locations.major_location_offsets[location_name]]