morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change hint for shop items to be "for sale"

Browse Source 
Lock Dungeon Prizes, as they're not supposed to be moved by any swapping mechanic
This commit is contained in:
Fabian Dill
2021-01-13 14:58:40 +01:00
parent c0cdeef67a
commit e8a57a4d24
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Main.py
View File

@@ -218,7 +218,7 @@ def main(args, seed=None):
if shop_slots:
# TODO: allow each game to register a blacklist to be used here?
blacklist_words = {"Rupee", "Pendant", "Crystal"}
blacklist_words = {"Rupee"}
blacklist_words = {item_name for item_name in item_table if any(
blacklist_word in item_name for blacklist_word in blacklist_words)}
blacklist_words.add("Bee")
@@ -238,12 +238,14 @@ def main(args, seed=None):
if shop.can_push_inventory(slot_num):
for c in candidates: # chosen item locations
if c.item_rule(location.item) and location.item_rule(c.item): # if rule is good...
logger.debug(f'Swapping {c} into {location}:: {c.item}')
swap_location_item(c, location, check_locked=False)
candidates.remove(c)
if not world.fulfills_accessibility():
swap_location_item(c, location, check_locked=False)
continue
logger.debug(f'Swapping {c} into {location}:: {location.item}')
break
else: