Skip to content
Merged
Changes from all commits
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
30 changes: 28 additions & 2 deletions src/DataValidation.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,21 @@ def checkItemNamesInLocationRequires():
if item.lower() == "or" or item.lower() == "and" or item == ")" or item == "(":
continue
else:
# it's just a category, so ignore it
# if it's a category, validate that the category exists
if '@' in item:
item = item.replace("|", "")
item_parts = item.split(":")
item_name = item

if len(item_parts) > 1:
item_name = item_parts[0]

item_name = item_name[1:]
item_category_exists = len([item for item in DataValidation.item_table if item_name in item.get('category', [])]) > 0

if not item_category_exists:
raise ValidationError("Item category %s is required by location %s but is misspelled or does not exist." % (item_name, location["name"]))

continue

item = item.replace("|", "")
Expand Down Expand Up @@ -90,8 +103,21 @@ def checkItemNamesInRegionRequires():
if item.lower() == "or" or item.lower() == "and" or item == ")" or item == "(":
continue
else:
# it's just a category, so ignore it
# if it's a category, validate that the category exists
if '@' in item:
item = item.replace("|", "")
item_parts = item.split(":")
item_name = item

if len(item_parts) > 1:
item_name = item_parts[0]

item_name = item_name[1:]
item_category_exists = len([item for item in DataValidation.item_table if item_name in item.get('category', [])]) > 0

if not item_category_exists:
raise ValidationError("Item category %s is required by region %s but is misspelled or does not exist." % (item_name, region_name))

continue

item = item.replace("|", "")
Expand Down