Adjusted modifier data refinement

Author: Shinga13

main.py

@@ -6,7 +6,7 @@
 
 class Launcher():
 
-    version = '2025.02b280'
+    version = '2025.03b020'
     __version__ = '2.0'
 
     # holds the style of the app

src/datafunctions.py

@@ -228,9 +228,10 @@ def load_cargo_data(self, threaded_worker: ThreadObject):
         except (IndexError, TypeError):
             modifier['available'] = list()
         for mod_type in modifier['type']:
+            mod_name = modifier['modifier'].replace('>', '>')
             try:
                 epic = bool(modifier['isepic'])
-                self.cache.modifiers[EQUIPMENT_TYPES[mod_type]][modifier['modifier']] = {
+                self.cache.modifiers[EQUIPMENT_TYPES[mod_type]][mod_name] = {
                     'stats': modifier['stats'],
                     'available': modifier['available'],
                     'epic': epic,

src/subwindows.py

@@ -32,13 +32,13 @@ def insert_modifiers(self, modifiers: dict = {}):
         """
         self._modifiers = modifiers
         self._mod_combos[0].clear()
-        self._mod_combos[0].addItems(self.unique_mods(modifiers))
+        self._mod_combos[0].addItems(self.not_epic_mods(modifiers))
         self._mod_combos[1].clear()
-        self._mod_combos[1].addItems(self.standard_mods(modifiers))
+        self._mod_combos[1].addItems(self.not_epic_mods(modifiers))
         self._mod_combos[2].clear()
-        self._mod_combos[2].addItems(self.standard_mods(modifiers))
+        self._mod_combos[2].addItems(self.not_epic_mods(modifiers))
         self._mod_combos[3].clear()
-        self._mod_combos[3].addItems(self.standard_mods(modifiers))
+        self._mod_combos[3].addItems(self.not_epic_mods(modifiers))
         self._mod_combos[4].clear()
         self._mod_combos[4].addItems(self.epic_mods(modifiers))
 
@@ -60,6 +60,15 @@ def standard_mods(self, modifiers: dict = {}) -> Iterator[str]:
             if not details['epic'] and not details['isunique']:
                 yield mod
 
+    def not_epic_mods(self, modifiers: dict = {}) -> Iterator[str]:
+        """
+        yields mods for first to fourth mod slot from modifier list
+        """
+        yield ''
+        for mod, details in modifiers.items():
+            if not details['epic']:
+                yield mod
+
     def epic_mods(self, modifiers: dict = {}) -> Iterator[str]:
         """
         yields mods for fifth mod slot from modifier list
@@ -414,7 +423,8 @@ def __init__(self, sets, parent_window, style: str = 'picker'):
         mod_layout = GridLayout(spacing=csp)
         self._mod_combos = [None] * 5
         for i in range(4):
-            mod_combo = create_combo_box(sets, style_override={'font': '@font'}, editable=True, size_policy=SMINMAX)
+            mod_combo = create_combo_box(
+                    sets, style_override={'font': '@font'}, editable=True, size_policy=SMINMAX)
             mod_combo.currentIndexChanged.connect(lambda mod, i=i: self.modifier_callback(mod, i))
             self._mod_combos[i] = mod_combo
             mod_layout.addWidget(mod_combo, i // 2, i % 2)
@@ -433,7 +443,7 @@ def __init__(self, sets, parent_window, style: str = 'picker'):
         save_button.setSizePolicy(SMINMAX)
         control_layout.addWidget(save_button)
         layout.addLayout(control_layout)
-        content_frame = create_frame(sets)
+        content_frame = create_frame(sets, size_policy=SMINMIN)
         content_frame.setLayout(layout)
         margin = sets.theme['defaults']['isp'] * ui_scale
         main_layout = VBoxLayout(margins=margin)