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

Block collection of Sahasrahlah. (#562)

This commit is contained in:
CaitSith2 2022-05-22 18:02:33 -07:00 committed by GitHub
parent e901a87afd
commit a7f647e3ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SNIClient.py
View File

@ -530,7 +530,8 @@ boss_locations = {Regions.lookup_name_to_id[name] for name in {'Eastern Palace -
"Thieves' Town - Boss", "Thieves' Town - Boss",
'Ice Palace - Boss', 'Ice Palace - Boss',
'Misery Mire - 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()} location_table_uw_id = {Regions.lookup_name_to_id[name]: data for name, data in location_table_uw.items()}
@ -974,8 +975,9 @@ async def track_locations(ctx: Context, roomid, roomdata):
for location_id, mask in location_table_npc_id.items(): for location_id, mask in location_table_npc_id.items():
if npc_value & mask != 0 and location_id not in ctx.locations_checked: if npc_value & mask != 0 and location_id not in ctx.locations_checked:
new_check(location_id) new_check(location_id)
if ctx.allow_collect and location_id in ctx.checked_locations and location_id not in ctx.locations_checked \ if ctx.allow_collect and location_id not in boss_locations and location_id in ctx.checked_locations \
and location_id in ctx.locations_info and ctx.locations_info[location_id].player != ctx.slot: 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 |= mask
npc_value_changed = True npc_value_changed = True
if npc_value_changed: if npc_value_changed: