Instantiate weapon object when needed

Signed-off-by: Shounak Dey <[email protected]>
sdglitched · Sep 28, 2024 · 892c3fd · 892c3fd
1 parent 59dae8a
commit 892c3fd
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/gi_loadouts/face/wind/calc.py b/gi_loadouts/face/wind/calc.py
@@ -107,7 +107,7 @@ def weap_keep(self) -> None:
             # MAIN
             kind = self.weap_area_type.currentText().strip()
             name = self.weap_area_name.currentText().strip()
-            weap = Family[kind][name]
+            weap = Family[kind][name]()
             refn = self.weap_area_refn.currentText().strip()
             weap.levl = getattr(Level, self.weap_area_levl.currentText().replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
             self.c_weap.base = ATTR(stat_name=WeaponStatType.attack.value, stat_data=weap.main_stat.stat_data)

diff --git a/gi_loadouts/face/wind/rule.py b/gi_loadouts/face/wind/rule.py
@@ -159,7 +159,7 @@ def convey_weapon_name_change(self, _: str = "") -> None:
             self.weap_area_refn_head.setText("No refinements available.")
             self.weap_area_refn_body.setText("No refinements available.")
             self.weap_area_stat.setText("No substats")
-            weap = Family[kind][name]
+            weap = Family[kind][name]()
             self.weap_area_levl.addItems([item.value.name for item in weap.levl_bind])
             self.weap_area_refn.addItems(item for item in weap.refinement.keys())
             self.weap_port_area.setPixmap(QPixmap(weap.rare.value.back))
@@ -175,7 +175,7 @@ def convey_weapon_levl_change(self, _: str = "") -> None:
         if self.weap_area_type.currentText().strip() != "" and self.weap_area_name.currentText().strip() != "" and self.weap_area_levl.currentText().strip() != "":
             name = self.weap_area_name.currentText()
             kind = self.weap_area_type.currentText().strip()
-            weap = Family[kind][name]
+            weap = Family[kind][name]()
             weap.levl = getattr(Level, self.weap_area_levl.currentText().replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
             self.weap_area_batk.setText(f"ATK {round(weap.main_stat.stat_data)}")
             if weap.levl.value.rank.value <= 1:
@@ -195,7 +195,7 @@ def convey_refinement_change(self, _: str = "") -> None:
         if self.weap_area_type.currentText().strip() != "" and self.weap_area_name.currentText().strip() != "" and self.weap_area_refn.currentText().strip() != "":
             name = self.weap_area_name.currentText()
             kind = self.weap_area_type.currentText().strip()
-            weap = Family[kind][name]
+            weap = Family[kind][name]()
             self.weap_area_refn_head.setText(f"<b>{weap.refi_name}</b>")
             self.weap_area_refn_body.setText(f"{weap.refinement[self.weap_area_refn.currentText().strip()].data}")
 

diff --git a/test/data/weap/test_bow.py b/test/data/weap/test_bow.py
@@ -51,7 +51,7 @@
     ]
 )
 def test_bow(name, rare, tier, levl, batk, seco, valu):
-    unit = BowsDict[name]
+    unit = BowsDict[name]()
     unit.levl = getattr(Level, levl.replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
     assert unit.rare == getattr(Rare, f"Star_{rare}")
     assert unit.tier == getattr(Tier, f"Tier_{tier}")

diff --git a/test/data/weap/test_catalyst.py b/test/data/weap/test_catalyst.py
@@ -53,7 +53,7 @@
     ]
 )
 def test_catalyst(name, rare, tier, levl, batk, seco, valu):
-    unit = CatalystsDict[name]
+    unit = CatalystsDict[name]()
     unit.levl = getattr(Level, levl.replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
     assert unit.rare == getattr(Rare, f"Star_{rare}")
     assert unit.tier == getattr(Tier, f"Tier_{tier}")

diff --git a/test/data/weap/test_claymore.py b/test/data/weap/test_claymore.py
@@ -49,7 +49,7 @@
     ]
 )
 def test_claymore(name, rare, tier, levl, batk, seco, valu):
-    unit = ClaymoresDict[name]
+    unit = ClaymoresDict[name]()
     unit.levl = getattr(Level, levl.replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
     assert unit.rare == getattr(Rare, f"Star_{rare}")
     assert unit.tier == getattr(Tier, f"Tier_{tier}")

diff --git a/test/data/weap/test_polearm.py b/test/data/weap/test_polearm.py
@@ -46,7 +46,7 @@
     ]
 )
 def test_polearm(name, rare, tier, levl, batk, seco, valu):
-    unit = PolearmsDict[name]
+    unit = PolearmsDict[name]()
     unit.levl = getattr(Level, levl.replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
     assert unit.rare == getattr(Rare, f"Star_{rare}")
     assert unit.tier == getattr(Tier, f"Tier_{tier}")

diff --git a/test/data/weap/test_sword.py b/test/data/weap/test_sword.py
@@ -57,7 +57,7 @@
     ]
 )
 def test_sword(name, rare, tier, levl, batk, seco, valu):
-    unit = SwordsDict[name]
+    unit = SwordsDict[name]()
     unit.levl = getattr(Level, levl.replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
     assert unit.rare == getattr(Rare, f"Star_{rare}")
     assert unit.tier == getattr(Tier, f"Tier_{tier}")

diff --git a/test/face/otpt/test_otpt.py b/test/face/otpt/test_otpt.py
@@ -88,7 +88,7 @@ def test_otpt(runner, qtbot, type, cond) -> None:
     Setting the weapon statistics
     """
     w_name = choice(list(Family[type].keys()))
-    w_objc = Family[type][w_name]
+    w_objc = Family[type][w_name]()
     w_levl = choice(w_objc.levl_bind).value.name
     w_refn = f"({choice(list(w_objc.refinement.keys()))})" if w_objc.refinement.keys() else ""
     runner.weap_area_name.setCurrentText(w_name)

diff --git a/test/face/wind/weap/kind/test_bow.py b/test/face/wind/weap/kind/test_bow.py
@@ -61,7 +61,7 @@ def test_bow(runner, name, rare, levl, batk, seco, valu, refn) -> None:
     """
     runner.head_char_elem.setCurrentText("Anemo")
     runner.head_char_name.setCurrentText("Venti")
-    unit = BowsDict[name]
+    unit = BowsDict[name]()
     unit.levl = getattr(Level, levl.replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
     runner.weap_area_name.setCurrentText(name)
     runner.weap_area_levl.setCurrentText(levl)

diff --git a/test/face/wind/weap/kind/test_catalyst.py b/test/face/wind/weap/kind/test_catalyst.py
@@ -63,7 +63,7 @@ def test_catalyst(runner, name, rare, levl, batk, seco, valu, refn) -> None:
     """
     runner.head_char_elem.setCurrentText("Dendro")
     runner.head_char_name.setCurrentText("Nahida")
-    unit = CatalystsDict[name]
+    unit = CatalystsDict[name]()
     unit.levl = getattr(Level, levl.replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
     runner.weap_area_name.setCurrentText(name)
     runner.weap_area_levl.setCurrentText(levl)

diff --git a/test/face/wind/weap/kind/test_claymore.py b/test/face/wind/weap/kind/test_claymore.py
@@ -59,7 +59,7 @@ def test_claymore(runner, name, rare, levl, batk, seco, valu, refn) -> None:
     """
     runner.head_char_elem.setCurrentText("Geo")
     runner.head_char_name.setCurrentText("Navia")
-    unit = ClaymoresDict[name]
+    unit = ClaymoresDict[name]()
     unit.levl = getattr(Level, levl.replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
     runner.weap_area_name.setCurrentText(name)
     runner.weap_area_levl.setCurrentText(levl)

diff --git a/test/face/wind/weap/kind/test_polearm.py b/test/face/wind/weap/kind/test_polearm.py
@@ -56,7 +56,7 @@ def test_polearm(runner, name, rare, levl, batk, seco, valu, refn) -> None:
     """
     runner.head_char_elem.setCurrentText("Electro")
     runner.head_char_name.setCurrentText("Raiden Shogun")
-    unit = PolearmsDict[name]
+    unit = PolearmsDict[name]()
     unit.levl = getattr(Level, levl.replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
     runner.weap_area_name.setCurrentText(name)
     runner.weap_area_levl.setCurrentText(levl)

diff --git a/test/face/wind/weap/kind/test_sword.py b/test/face/wind/weap/kind/test_sword.py
@@ -67,7 +67,7 @@ def test_sword(runner, name, rare, levl, batk, seco, valu, refn) -> None:
     """
     runner.head_char_elem.setCurrentText("Hydro")
     runner.head_char_name.setCurrentText("Furina")
-    unit = SwordsDict[name]
+    unit = SwordsDict[name]()
     unit.levl = getattr(Level, levl.replace(" ", "_").replace("(", "").replace(")", "").replace("/", "_"))
     runner.weap_area_name.setCurrentText(name)
     runner.weap_area_levl.setCurrentText(levl)

diff --git a/test/face/wind/weap/test_file.py b/test/face/wind/weap/test_file.py
@@ -52,7 +52,7 @@ def test_weap_save(runner, qtbot, mocker, type, char) -> None:
     Set the user interface elements as intended
     """
     name = choice(list(Family[type].keys()))
-    objc = Family[type][name]
+    objc = Family[type][name]()
     levl = choice(objc.levl_bind).value.name
 
     runner.head_char_name.setCurrentText(char)
@@ -93,7 +93,7 @@ def test_weap_save_fail(runner, qtbot, mocker, type, char) -> None:
     Set the user interface elements as intended
     """
     name = choice(list(Family[type].keys()))
-    objc = Family[type][name]
+    objc = Family[type][name]()
     levl = choice(objc.levl_bind).value.name
 
     runner.head_char_name.setCurrentText(char)
@@ -471,7 +471,7 @@ def test_weap_save_yaml_actual(runner, qtbot, mocker, type, char) -> None:
     Set the user interface elements as intended
     """
     name = choice(list(Family[type].keys()))
-    objc = Family[type][name]
+    objc = Family[type][name]()
     levl = choice(objc.levl_bind).value.name
 
     runner.head_char_name.setCurrentText(char)
@@ -533,7 +533,7 @@ def test_weap_save_json_actual(runner, qtbot, mocker, type, char) -> None:
     Set the user interface elements as intended
     """
     name = choice(list(Family[type].keys()))
-    objc = Family[type][name]
+    objc = Family[type][name]()
     levl = choice(objc.levl_bind).value.name
 
     runner.head_char_name.setCurrentText(char)