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

More fixes to non_local_items

Browse Source
This commit is contained in:
CaitSith2
2020-11-22 14:29:11 -08:00
parent 25f0a5956c
commit 4370447adc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Main.py
View File

@@ -113,7 +113,7 @@ def main(args, seed=None):
# item in item_table gets checked in mystery, but not CLI - so we double-check here # item in item_table gets checked in mystery, but not CLI - so we double-check here
world.local_items[player] = {item.strip() for item in args.local_items[player].split(',') if world.local_items[player] = {item.strip() for item in args.local_items[player].split(',') if
item.strip() in item_table} item.strip() in item_table}
world.non_local_items[player] = {item.strip() for item in args.local_items[player].split(',') if world.non_local_items[player] = {item.strip() for item in args.non_local_items[player].split(',') if
item.strip() in item_table} item.strip() in item_table}
# items can't be both local and non-local, prefer local # items can't be both local and non-local, prefer local
world.non_local_items[player] -= world.local_items[player] world.non_local_items[player] -= world.local_items[player]

2
Mystery.py
View File

@@ -497,7 +497,7 @@ def roll_settings(weights):
if item in item_table: if item in item_table:
ret.non_local_items.add(item) ret.non_local_items.add(item)
else: else:
raise Exception(f"Could not force item {item} to be world-local, as it was not recognized.") raise Exception(f"Could not force item {item} to be world-non-local, as it was not recognized.")
ret.non_local_items = ",".join(ret.non_local_items) ret.non_local_items = ",".join(ret.non_local_items)