diff --git a/main.py b/main.py index 7b48320a1f8eb3a71bd1d79e79c65d5f562adbfc..9a19d803c60dab1fa3217cd9976faa55f151cc30 100644 --- a/main.py +++ b/main.py @@ -30,7 +30,7 @@ defense_choices = [ "En", "A/Ev", "Ev/En", - "A/En", + "En/A", ] weapon_choices = [ "OneHandMaces", diff --git a/resources/parsers/defense.py b/resources/parsers/defense.py index 038bb4ee7804cd11d0bcaa97aeaafe3f45638f66..738217599d3fae97f5f97073f1551725a53cfec9 100644 --- a/resources/parsers/defense.py +++ b/resources/parsers/defense.py @@ -61,7 +61,7 @@ class DefenseParser: self.parse_subnum += 1 self.parse_en() - if "A/En" in self.defense_types: + if "En/A" in self.defense_types: self.parse_subnum += 1 self.parse_en_a() diff --git a/resources/parsers/table_of_contents.py b/resources/parsers/table_of_contents.py index 1c110263060050305a2929a01fdf566c59b900d6..e106b0be279732bc166cd8f9624f2e8d7d6c7d77 100644 --- a/resources/parsers/table_of_contents.py +++ b/resources/parsers/table_of_contents.py @@ -304,10 +304,10 @@ class TableOfContentsGenerator: ), ) - if "A/En" in self.shield_types: + if "En/A" in self.shield_types: parse_subsubnum += 1 self.filter_file.write( - "# [{0}.{1}.{2}] - A/En Shields\n".format( + "# [{0}.{1}.{2}] - En/A Shields\n".format( str(parse_num).zfill(3), str(parse_subnum).zfill(2), str(parse_subsubnum).zfill(2), diff --git a/resources/parsers/weapons.py b/resources/parsers/weapons.py index c23cfc44feb986647890ad1c9a064adda5f96e3c..fbd08d924bdacf8887377e44821ad708e320d0a9 100644 --- a/resources/parsers/weapons.py +++ b/resources/parsers/weapons.py @@ -718,14 +718,14 @@ class WeaponParser: # Parse item. self.parse_item(item, display_dict["En"]) - if "A/En" in self.shield_types: + if "En/A" in self.shield_types: # Parse Armor/Energy Shield shields. subsubnum += 1 self.filter_file.write("\n") self.filter_file.write("# --------------------------------- #\n") self.filter_file.write( - "# --- [{0}.{1}.{2}] - A/En Shields --- #\n".format( + "# --- [{0}.{1}.{2}] - En/A Shields --- #\n".format( self.parse_num, str(self.parse_subnum).zfill(2), subsubnum ) )