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

Fixed line

This commit is contained in:
pepperpow 2020-12-23 16:36:58 -06:00
parent 0debc3289b
commit c67e5ae6e6
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ItemPool.py
View File

@ -470,11 +470,7 @@ def create_dynamic_shop_locations(world, player):
if item is None: if item is None:
continue continue
if item['create_location']: if item['create_location']:
<<<<<<< HEAD
loc = Location(player, "{} Slot Item {}".format(shop.region.name, i+1), parent=shop.region)
=======
loc = Location(player, "{} Shop Slot {}".format(shop.region.name, i+1), parent=shop.region) loc = Location(player, "{} Shop Slot {}".format(shop.region.name, i+1), parent=shop.region)
>>>>>>> ffe5b4b1a1d806c09a1be91a283dd3a6cdbcaafa
shop.region.locations.append(loc) shop.region.locations.append(loc)
world.dynamic_locations.append(loc) world.dynamic_locations.append(loc)