alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'Ambrosia' into Bias

Browse Source
This commit is contained in:
aerinon
2021-09-16 16:15:10 -06:00
parent 391db7b5c4 9e04417072
commit ee545b3543
11 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ItemList.py
View File

@@ -4,7 +4,6 @@ import math
import RaceRandom as random
from BaseClasses import Region, RegionType, Shop, ShopType, Location, CollectionState
from Bosses import place_bosses
from EntranceShuffle import connect_entrance
from Regions import shop_to_location_table, retro_shops, shop_table_by_location
from Fill import FillError, fill_restrictive, fast_fill, get_dungeon_item_pool
@@ -376,7 +375,6 @@ def generate_itempool(world, player):
tr_medallion = ['Ether', 'Quake', 'Bombos'][random.randint(0, 2)]
world.required_medallions[player] = (mm_medallion, tr_medallion)
place_bosses(world, player)
set_up_shops(world, player)
if world.retro[player]: