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

Retro: fix take any entrances with default connections

This commit is contained in:
Bonta-kun 2019-12-27 19:11:41 +01:00
parent dcc3f7d53b
commit 819f6dc975
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BaseClasses.py
View File

@ -4,6 +4,7 @@ import logging
import json import json
from collections import OrderedDict from collections import OrderedDict
from _vendor.collections_extended import bag from _vendor.collections_extended import bag
from EntranceShuffle import door_addresses
from Utils import int16_as_bytes from Utils import int16_as_bytes
class World(object): class World(object):
@ -917,8 +918,8 @@ class Shop(object):
# [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][sram_index] # [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][sram_index]
entrances = self.region.entrances entrances = self.region.entrances
config = self.item_count config = self.item_count
if len(entrances) == 1 and entrances[0].addresses: if len(entrances) == 1 and entrances[0].name in door_addresses:
door_id = entrances[0].addresses+1 door_id = door_addresses[entrances[0].name][0]+1
else: else:
door_id = 0 door_id = 0
config |= 0x40 # ignore door id config |= 0x40 # ignore door id