Skip to content

Commit

Permalink
Block collection of Sahasrahlah. (ArchipelagoMW#562)
Browse files Browse the repository at this point in the history
  • Loading branch information
CaitSith2 authored May 23, 2022
1 parent e901a87 commit a7f647e
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions SNIClient.py
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,8 @@ async def deathlink_kill_player(ctx: Context):
"Thieves' Town - Boss",
'Ice Palace - Boss',
'Misery Mire - Boss',
'Turtle Rock - Boss'}}
'Turtle Rock - Boss',
'Sahasrahla'}}

location_table_uw_id = {Regions.lookup_name_to_id[name]: data for name, data in location_table_uw.items()}

Expand Down Expand Up @@ -974,8 +975,9 @@ def new_check(location_id):
for location_id, mask in location_table_npc_id.items():
if npc_value & mask != 0 and location_id not in ctx.locations_checked:
new_check(location_id)
if ctx.allow_collect and location_id in ctx.checked_locations and location_id not in ctx.locations_checked \
and location_id in ctx.locations_info and ctx.locations_info[location_id].player != ctx.slot:
if ctx.allow_collect and location_id not in boss_locations and location_id in ctx.checked_locations \
and location_id not in ctx.locations_checked and location_id in ctx.locations_info \
and ctx.locations_info[location_id].player != ctx.slot:
npc_value |= mask
npc_value_changed = True
if npc_value_changed:
Expand Down

0 comments on commit a7f647e

Please sign in to comment.