diff --git a/worlds/jakanddaxter/Client.py b/worlds/jakanddaxter/Client.py index e737cbb67f..d1a43179cc 100644 --- a/worlds/jakanddaxter/Client.py +++ b/worlds/jakanddaxter/Client.py @@ -520,7 +520,12 @@ async def run_game(ctx: JakAndDaxterContext): goalc_process = subprocess.Popen(goalc_args, creationflags=subprocess.CREATE_NEW_CONSOLE) except AttributeError as e: - ctx.on_log_error(logger, f"Host.yaml does not contain {e.args[0]}, unable to locate game executables.") + if " " in e.args[0]: + # YAML keys in Host.yaml ought to contain no spaces, which means this is a much more important error. + ctx.on_log_error(logger, e.args[0]) + else: + ctx.on_log_error(logger, + f"Host.yaml does not contain {e.args[0]}, unable to locate game executables.") return except FileNotFoundError as e: msg = (f"The following path could not be found: {e.filename}\n" diff --git a/worlds/jakanddaxter/__init__.py b/worlds/jakanddaxter/__init__.py index d07615221e..005a42fae4 100644 --- a/worlds/jakanddaxter/__init__.py +++ b/worlds/jakanddaxter/__init__.py @@ -137,57 +137,57 @@ class JakAndDaxterWorld(World): } location_name_groups = { "Power Cells": set(cell_location_table.values()), - "GR Power Cells": set(Cells.locGR_cellTable.values()), - "SV Power Cells": set(Cells.locSV_cellTable.values()), - "FJ Power Cells": set(Cells.locFJ_cellTable.values()), - "SB Power Cells": set(Cells.locSB_cellTable.values()), - "MI Power Cells": set(Cells.locMI_cellTable.values()), - "FC Power Cells": set(Cells.locFC_cellTable.values()), - "RV Power Cells": set(Cells.locRV_cellTable.values()), - "PB Power Cells": set(Cells.locPB_cellTable.values()), - "LPC Power Cells": set(Cells.locLPC_cellTable.values()), - "BS Power Cells": set(Cells.locBS_cellTable.values()), - "MP Power Cells": set(Cells.locMP_cellTable.values()), - "VC Power Cells": set(Cells.locVC_cellTable.values()), - "SC Power Cells": set(Cells.locSC_cellTable.values()), - "SM Power Cells": set(Cells.locSM_cellTable.values()), - "LT Power Cells": set(Cells.locLT_cellTable.values()), - "GMC Power Cells": set(Cells.locGMC_cellTable.values()), + "Power Cells - GR": set(Cells.locGR_cellTable.values()), + "Power Cells - SV": set(Cells.locSV_cellTable.values()), + "Power Cells - FJ": set(Cells.locFJ_cellTable.values()), + "Power Cells - SB": set(Cells.locSB_cellTable.values()), + "Power Cells - MI": set(Cells.locMI_cellTable.values()), + "Power Cells - FC": set(Cells.locFC_cellTable.values()), + "Power Cells - RV": set(Cells.locRV_cellTable.values()), + "Power Cells - PB": set(Cells.locPB_cellTable.values()), + "Power Cells - LPC": set(Cells.locLPC_cellTable.values()), + "Power Cells - BS": set(Cells.locBS_cellTable.values()), + "Power Cells - MP": set(Cells.locMP_cellTable.values()), + "Power Cells - VC": set(Cells.locVC_cellTable.values()), + "Power Cells - SC": set(Cells.locSC_cellTable.values()), + "Power Cells - SM": set(Cells.locSM_cellTable.values()), + "Power Cells - LT": set(Cells.locLT_cellTable.values()), + "Power Cells - GMC": set(Cells.locGMC_cellTable.values()), "Scout Flies": set(scout_location_table.values()), - "GR Scout Flies": set(Scouts.locGR_scoutTable.values()), - "SV Scout Flies": set(Scouts.locSV_scoutTable.values()), - "FJ Scout Flies": set(Scouts.locFJ_scoutTable.values()), - "SB Scout Flies": set(Scouts.locSB_scoutTable.values()), - "MI Scout Flies": set(Scouts.locMI_scoutTable.values()), - "FC Scout Flies": set(Scouts.locFC_scoutTable.values()), - "RV Scout Flies": set(Scouts.locRV_scoutTable.values()), - "PB Scout Flies": set(Scouts.locPB_scoutTable.values()), - "LPC Scout Flies": set(Scouts.locLPC_scoutTable.values()), - "BS Scout Flies": set(Scouts.locBS_scoutTable.values()), - "MP Scout Flies": set(Scouts.locMP_scoutTable.values()), - "VC Scout Flies": set(Scouts.locVC_scoutTable.values()), - "SC Scout Flies": set(Scouts.locSC_scoutTable.values()), - "SM Scout Flies": set(Scouts.locSM_scoutTable.values()), - "LT Scout Flies": set(Scouts.locLT_scoutTable.values()), + "Scout Flies - GR": set(Scouts.locGR_scoutTable.values()), + "Scout Flies - SV": set(Scouts.locSV_scoutTable.values()), + "Scout Flies - FJ": set(Scouts.locFJ_scoutTable.values()), + "Scout Flies - SB": set(Scouts.locSB_scoutTable.values()), + "Scout Flies - MI": set(Scouts.locMI_scoutTable.values()), + "Scout Flies - FC": set(Scouts.locFC_scoutTable.values()), + "Scout Flies - RV": set(Scouts.locRV_scoutTable.values()), + "Scout Flies - PB": set(Scouts.locPB_scoutTable.values()), + "Scout Flies - LPC": set(Scouts.locLPC_scoutTable.values()), + "Scout Flies - BS": set(Scouts.locBS_scoutTable.values()), + "Scout Flies - MP": set(Scouts.locMP_scoutTable.values()), + "Scout Flies - VC": set(Scouts.locVC_scoutTable.values()), + "Scout Flies - SC": set(Scouts.locSC_scoutTable.values()), + "Scout Flies - SM": set(Scouts.locSM_scoutTable.values()), + "Scout Flies - LT": set(Scouts.locLT_scoutTable.values()), "Specials": set(special_location_table.values()), "Orb Caches": set(cache_location_table.values()), "Precursor Orbs": set(orb_location_table.values()), - "GR Precursor Orbs": set(Orbs.locGR_orbBundleTable.values()), - "SV Precursor Orbs": set(Orbs.locSV_orbBundleTable.values()), - "FJ Precursor Orbs": set(Orbs.locFJ_orbBundleTable.values()), - "SB Precursor Orbs": set(Orbs.locSB_orbBundleTable.values()), - "MI Precursor Orbs": set(Orbs.locMI_orbBundleTable.values()), - "FC Precursor Orbs": set(Orbs.locFC_orbBundleTable.values()), - "RV Precursor Orbs": set(Orbs.locRV_orbBundleTable.values()), - "PB Precursor Orbs": set(Orbs.locPB_orbBundleTable.values()), - "LPC Precursor Orbs": set(Orbs.locLPC_orbBundleTable.values()), - "BS Precursor Orbs": set(Orbs.locBS_orbBundleTable.values()), - "MP Precursor Orbs": set(Orbs.locMP_orbBundleTable.values()), - "VC Precursor Orbs": set(Orbs.locVC_orbBundleTable.values()), - "SC Precursor Orbs": set(Orbs.locSC_orbBundleTable.values()), - "SM Precursor Orbs": set(Orbs.locSM_orbBundleTable.values()), - "LT Precursor Orbs": set(Orbs.locLT_orbBundleTable.values()), - "GMC Precursor Orbs": set(Orbs.locGMC_orbBundleTable.values()), + "Precursor Orbs - GR": set(Orbs.locGR_orbBundleTable.values()), + "Precursor Orbs - SV": set(Orbs.locSV_orbBundleTable.values()), + "Precursor Orbs - FJ": set(Orbs.locFJ_orbBundleTable.values()), + "Precursor Orbs - SB": set(Orbs.locSB_orbBundleTable.values()), + "Precursor Orbs - MI": set(Orbs.locMI_orbBundleTable.values()), + "Precursor Orbs - FC": set(Orbs.locFC_orbBundleTable.values()), + "Precursor Orbs - RV": set(Orbs.locRV_orbBundleTable.values()), + "Precursor Orbs - PB": set(Orbs.locPB_orbBundleTable.values()), + "Precursor Orbs - LPC": set(Orbs.locLPC_orbBundleTable.values()), + "Precursor Orbs - BS": set(Orbs.locBS_orbBundleTable.values()), + "Precursor Orbs - MP": set(Orbs.locMP_orbBundleTable.values()), + "Precursor Orbs - VC": set(Orbs.locVC_orbBundleTable.values()), + "Precursor Orbs - SC": set(Orbs.locSC_orbBundleTable.values()), + "Precursor Orbs - SM": set(Orbs.locSM_orbBundleTable.values()), + "Precursor Orbs - LT": set(Orbs.locLT_orbBundleTable.values()), + "Precursor Orbs - GMC": set(Orbs.locGMC_orbBundleTable.values()), "Trades": {location_table[Cells.to_ap_id(k)] for k in {11, 12, 31, 32, 33, 96, 97, 98, 99, 13, 14, 34, 35, 100, 101}}, "'Free 7 Scout Flies' Power Cells": set(Cells.loc7SF_cellTable.values()),