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

Catch plando errors that will never resolve at mystery rolling time.

This commit is contained in:
CaitSith2 2021-01-03 07:14:31 -08:00
parent b7f41e8991
commit bf5930e193
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Mystery.py
View File

@ -18,6 +18,8 @@ from EntranceRandomizer import parse_arguments
from Main import main as ERmain from Main import main as ERmain
from Main import get_seed, seeddigits from Main import get_seed, seeddigits
from Items import item_name_groups, item_table from Items import item_name_groups, item_table
from Regions import location_table
from Text import TextTable
def mystery_argparse(): def mystery_argparse():
@ -559,17 +561,26 @@ def roll_settings(weights, plando_options: typing.Set[str] = frozenset(("bosses"
for placement in options: for placement in options:
if roll_percentage(get_choice("percentage", placement, 100)): if roll_percentage(get_choice("percentage", placement, 100)):
item = get_choice("item", placement) item = get_choice("item", placement)
if item not in item_table:
raise Exception(f"Could not plando item {item} as the item was not recognized")
location = get_choice("location", placement) location = get_choice("location", placement)
if location not in location_table:
raise Exception(f"Could not plando item {item} at location {location} as the location was not recognized")
from_pool = get_choice("from_pool", placement, True) from_pool = get_choice("from_pool", placement, True)
location_world = get_choice("world", placement, False) location_world = get_choice("world", placement, False)
ret.plando_items.append(PlandoItem(item, location, location_world, from_pool)) ret.plando_items.append(PlandoItem(item, location, location_world, from_pool))
ret.plando_texts = {} ret.plando_texts = {}
if "texts" in plando_options: if "texts" in plando_options:
tt = TextTable()
tt.removeUnwantedText()
options = weights.get("plando_texts", []) options = weights.get("plando_texts", [])
for placement in options: for placement in options:
if roll_percentage(get_choice("percentage", placement, 100)): if roll_percentage(get_choice("percentage", placement, 100)):
ret.plando_texts[str(get_choice("at", placement))] = str(get_choice("text", placement)) at = str(get_choice("at", placement))
if at not in tt:
raise Exception(f"No text target \"{at}\" found.")
ret.plando_texts[at] = str(get_choice("text", placement))
ret.plando_connections = [] ret.plando_connections = []
if "connections" in plando_options: if "connections" in plando_options: