From 0bec266e5fdbdba97357eff1199317b50cff9036 Mon Sep 17 00:00:00 2001
From: Brandon Rodriguez <brodriguez8774@gmail.com>
Date: Sat, 17 Aug 2024 07:35:49 -0400
Subject: [PATCH] Correct some inconsistent naming for the Str/Int armor type
---
main.py | 2 +-
resources/parsers/defense.py | 2 +-
resources/parsers/table_of_contents.py | 4 ++--
resources/parsers/weapons.py | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/main.py b/main.py
index 7b48320..9a19d80 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 038bb4e..7382175 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 1c11026..e106b0b 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 c23cfc4..fbd08d9 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
)
)
--
GitLab