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

update to Shops release

This commit is contained in:
Fabian Dill 2021-01-30 23:37:35 +01:00
parent a646594f08
commit 28c12054dd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shops.py
View File

@ -4,8 +4,8 @@ from typing import List, Union, Optional, Set, NamedTuple, Dict
import logging import logging
from BaseClasses import Location from BaseClasses import Location
from EntranceShuffle import door_addresses from worlds.alttp.EntranceShuffle import door_addresses
from Items import item_name_groups, item_table, ItemFactory, trap_replaceable from worlds.alttp.Items import item_name_groups, item_table, ItemFactory, trap_replaceable
from Utils import int16_as_bytes from Utils import int16_as_bytes
logger = logging.getLogger("Shops") logger = logging.getLogger("Shops")

2
worlds/alttp/Main.py
View File

@ -19,6 +19,7 @@ from worlds.alttp.Rom import patch_rom, patch_race_rom, patch_enemizer, apply_ro
from worlds.alttp.Rules import set_rules from worlds.alttp.Rules import set_rules
from worlds.alttp.Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive from worlds.alttp.Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive
from Fill import distribute_items_restrictive, flood_items, balance_multiworld_progression, distribute_planned from Fill import distribute_items_restrictive, flood_items, balance_multiworld_progression, distribute_planned
from Shops import create_shops, ShopSlotFill, SHOP_ID_START, total_shop_slots, FillDisabledShopSlots
from worlds.alttp.ItemPool import generate_itempool, difficulties, fill_prizes from worlds.alttp.ItemPool import generate_itempool, difficulties, fill_prizes
from Utils import output_path, parse_player_names, get_options, __version__, _version_tuple from Utils import output_path, parse_player_names, get_options, __version__, _version_tuple
import Patch import Patch
@ -351,7 +352,6 @@ def main(args, seed=None):
main_entrance = get_entrance_to_region(region) main_entrance = get_entrance_to_region(region)
for location in region.locations: for location in region.locations:
if type(location.address) == int: # skips events and crystals if type(location.address) == int: # skips events and crystals
if location.address >= SHOP_ID_START + 33: continue
if lookup_vanilla_location_to_entrance[location.address] != main_entrance.name: if lookup_vanilla_location_to_entrance[location.address] != main_entrance.name:
er_hint_data[region.player][location.address] = main_entrance.name er_hint_data[region.player][location.address] = main_entrance.name