Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/DataValidation.py
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,10 @@ def runPreFillDataValidation(world: World, multiworld: MultiWorld):
except ValidationError as e: validation_errors.append(e)

if validation_errors:
heading = f"ValidationError(s) for pre_fill of {world.game}:";
newline = "\n"
raise Exception(f"\nValidationError(s) for pre_fill of player {world.player}: \n\n{newline.join([' - ' + str(validation_error) for validation_error in validation_errors])}\n\n")
raise Exception(f"\n\n{heading} \n\n{newline.join([' - ' + str(validation_error) for validation_error in validation_errors])}\n\n")

# Called during stage_assert_generate
def runGenerationDataValidation() -> None:
validation_errors = []
Expand Down Expand Up @@ -476,5 +478,9 @@ def runGenerationDataValidation() -> None:
# check for regions that are set as non-starting regions and have no connectors to them (so are unreachable)
try: DataValidation.checkForNonStartingRegionsThatAreUnreachable()
except ValidationError as e: validation_errors.append(e)

if len(validation_errors) > 0:
raise Exception("\nValidationError(s): \n\n%s\n\n" % ("\n".join([' - ' + str(validation_error) for validation_error in validation_errors])))
creator = DataValidation.game_table.get('creator') or DataValidation.game_table.get('player', '')
heading = f"ValidationError(s) in Manual_{DataValidation.game_table['game']}_{creator}:";

raise Exception("\n\n%s \n\n%s\n\n" % (heading, "\n".join([' - ' + str(validation_error) for validation_error in validation_errors])))