04.18 commit

README.md

@@ -0,0 +1,28 @@
+# Comprehensive Damage Formulator with JCL Parser
+
+## User Guide
+### In Progress
+
+## Contributing to This Project
+### Add Your School
+To add your school to the application, follow the steps below:
+Under the schools directory, create a new python directory name it after your school (Please use snake_case for the name).
+and add the following files to your directory:
+
+- **\_\_init__.py**: this file will import all detail a school needed 
+- **attribute.py**: define your school attribute, like extra attribute from school
+- **buffs.py**: define the buffs of your school
+- **gains.py**: define the gains from your school equipment, like divine and tier set activate
+- **recipes.py**: define the recipes for skill of your school
+- **skills.py**: define the skills of your school, include all damage skill and dot trigger skill
+- **talents.py**: define the talents of your school
+
+### Integrate Your School into UI
+Once the school framework is ready, make your school data available on our QT-UI:
+
+Open the **parser.py** under **utils** dir, and add your school into **SUPPORT_SCHOOL** dictionary like below:
+
+- key: the school id you can find in LUA or ask me
+- value: a School instance set by the details import from **schools/<YOUR_SCHOOL>**
+
+Feel free to contribute to this exciting project! Your collaboration will make our tool more comprehensive and valuable to all users.

general/buffs.py

@@ -17,8 +17,8 @@ GENERAL_BUFFS = {
     6360: {
         "buff_name": "风特效",
         "gain_attributes": {
-            "physical_overcome_base": [0] * 99 + sum([[0] + [0, v] + [0] * 5 for v in [6408, 8330, 9291, 10573]], []),
-            "magical_overcome_base": [0] * 99 + sum([[0] + [v, 0] + [0] * 5 for v in [6408, 8330, 9291, 10573]], [])
+            "physical_overcome_base": [0] * 99 + sum([[0] + [0, v] + [0] * 4 for v in [6408, 8330, 9291, 10573]], []),
+            "magical_overcome_base": [0] * 99 + sum([[0] + [v, 0] + [0] * 4 for v in [6408, 8330, 9291, 10573]], [])
         }
     }
 }

general/gains/formation.py

@@ -70,7 +70,7 @@ class 北斗七星阵(FormationGain):
         "strain_gain": 20,
         "physical_critical_power_gain": 150
     }
-    rate_gain_attributes = {"physical_critical_strike_gain": 100}
+    rate_gain_attributes = {"physical_critical_strike_gain": 100 * 5}
 
 
 class 九宫八卦阵(FormationGain):
@@ -79,7 +79,7 @@ class 九宫八卦阵(FormationGain):
         "strain_gain": 20,
         "magical_critical_power_gain": 154
     }
-    rate_gain_attributes = {"magical_critical_strike_gain": 100}
+    rate_gain_attributes = {"magical_critical_strike_gain": 100 * 5}
 
 
 class 依山观澜阵(FormationGain):

general/gains/team.py

@@ -55,7 +55,7 @@ class 乘龙箭(TeamGain):
 
 
 class 号令三军(TeamGain):
-    gain_attributes = {"strain_base": 470}
+    gain_attributes = {"strain_base": (470 + 470 / 2) / 2}
 
 
 class 激雷(TeamGain):
@@ -118,7 +118,7 @@ class 戒火(TeamGain):
 
 class 朝圣言(TeamGain):
     gain_attributes = {"strain_base": 470}
-    variety_values = {"圣浴明心": 705 - 470}
+    variety_values = {"圣浴明心": 820 - 470}
 
 
 """ 丐帮 """
@@ -147,7 +147,7 @@ class 寒啸千军(TeamGain):
 
 
 class 庄周梦(TeamGain):
-    gain_attributes = {"strain_base": 60}
+    gain_attributes = {"strain_base": 50}
 
 
 """ 霸刀 """
@@ -168,6 +168,26 @@ class 配伍(TeamGain):
     gain_attributes = {"all_major_gain": 10 * 5}
 
 
+TEAM_GAIN_LIMIT = {
+    "左旋右转": {
+        "stack": 150
+    },
+    "号令三军": {
+        "stack": 48
+    },
+    "舍身弘法": {
+        "stack": 36
+    },
+    "朝圣言": {
+        "stack": 24
+    },
+    "振奋": {
+        "stack": 100
+    },
+    "庄周梦": {
+        "stack": 150
+    }
+}
 TEAM_GAINS = {
     "袖气": 袖气,
     "左旋右转": 左旋右转,

qt/app.py

@@ -72,7 +72,10 @@ class MainWindow(QMainWindow):
             self.dashboard_widget, self.talents_widget, self.recipes_widget,
             self.equipments_widget, self.consumable_widget, self.bonus_widget
         )
-        config_script(parser, self.config_widget, self.equipments_widget)
+        config_script(
+            parser, self.config_widget, self.talents_widget, self.recipes_widget,
+            self.equipments_widget, self.consumable_widget, self.bonus_widget
+        )
         talents = talents_script(self.talents_widget)
         recipes = recipes_script(self.recipes_widget)
         equipments = equipments_script(self.equipments_widget)

qt/components/__init__.py

@@ -77,8 +77,9 @@ class ComboWithLabel(LabelWidget):
         self.setLayout(layout)
 
         self.combo_box = QComboBox()
+        self.items = []
         if items:
-            self.combo_box.addItems(items)
+            self.set_items(items)
         if index:
             self.combo_box.setCurrentIndex(index)
 
@@ -87,12 +88,17 @@ class ComboWithLabel(LabelWidget):
 
         layout.addStretch()
 
-    def set_items(self, items, default_index=0):
+    def set_items(self, items, keep_index=False, default_index=0):
+        self.items = items
         self.combo_box.blockSignals(True)
+        current_text = self.combo_box.currentText()
         self.combo_box.clear()
         self.combo_box.addItems(items)
         self.combo_box.blockSignals(False)
-        self.combo_box.setCurrentIndex(default_index)
+        if keep_index and current_text and current_text in items:
+            self.combo_box.setCurrentIndex(items.index(current_text))
+        else:
+            self.combo_box.setCurrentIndex(default_index)
 
 
 class RadioWithLabel(LabelWidget):

qt/components/bonuses.py

@@ -1,3 +1,4 @@
+from general.gains.team import TEAM_GAIN_LIMIT
 from qt.components import ComboWithLabel, SpinWithLabel, RadioWithLabel
 from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QGridLayout, QTabWidget
 
@@ -12,8 +13,8 @@ class FormationWidget(QWidget):
         layout.addWidget(self.formation)
         self.core_rate = SpinWithLabel("四重覆盖(%)", maximum=100)
         layout.addWidget(self.core_rate)
-        self.formation_rate = SpinWithLabel("五重覆盖(%)", maximum=100)
-        layout.addWidget(self.formation_rate)
+        self.rate = SpinWithLabel("五重覆盖(%)", maximum=100)
+        layout.addWidget(self.rate)
 
 
 class TeamGainsWidget(QWidget):
@@ -34,7 +35,7 @@ class TeamGainsWidget(QWidget):
         tab_layout.addWidget(self.team_gains["袖气"], 0, 0)
 
         self.team_gains["左旋右转"] = {
-            "stack": SpinWithLabel("左旋右转", "层数", maximum=133)
+            "stack": SpinWithLabel("左旋右转", "层数", maximum=TEAM_GAIN_LIMIT["左旋右转"]["stack"])
         }
         tab_layout.addWidget(self.team_gains["左旋右转"]["stack"], 1, 0)
         self.team_gains["泠风解怀"] = {
@@ -60,7 +61,7 @@ class TeamGainsWidget(QWidget):
         tab_layout.addWidget(self.team_gains["乘龙箭"]["rate"], 2, 0)
 
         self.team_gains["号令三军"] = {
-            "stack": SpinWithLabel("号令三军", "层数", maximum=48),
+            "stack": SpinWithLabel("号令三军", "层数", maximum=TEAM_GAIN_LIMIT["号令三军"]["stack"]),
             "rate": SpinWithLabel("号令三军", "覆盖(%)", maximum=100)
         }
         tab_layout.addWidget(self.team_gains["号令三军"]["stack"], 3, 0)
@@ -81,7 +82,7 @@ class TeamGainsWidget(QWidget):
         tab_layout.addWidget(self.team_gains["立地成佛"]["rate"], 0, 0)
 
         self.team_gains["舍身弘法"] = {
-            "stack": SpinWithLabel("舍身弘法", "层数", maximum=36),
+            "stack": SpinWithLabel("舍身弘法", "层数", maximum=TEAM_GAIN_LIMIT["舍身弘法"]["stack"]),
             "rate": SpinWithLabel("舍身弘法", "覆盖(%)", maximum=100)
         }
         tab_layout.addWidget(self.team_gains["舍身弘法"]["stack"], 1, 0)
@@ -114,7 +115,7 @@ class TeamGainsWidget(QWidget):
         tabs.addTab(tab, "藏剑")
 
         self.team_gains["剑锋百锻"] = {
-            "rate": SpinWithLabel("剑锋百锻", "覆盖(%)", maximum=int(100 / 6))
+            "rate": SpinWithLabel("剑锋百锻", "覆盖(%)", maximum=100)
         }
         tab_layout.addWidget(self.team_gains["剑锋百锻"]["rate"], 0, 0)
 
@@ -135,7 +136,7 @@ class TeamGainsWidget(QWidget):
         tab_layout.addWidget(self.team_gains["戒火"], 0, 0)
 
         self.team_gains["朝圣言"] = {
-            "stack": SpinWithLabel("朝圣言", "层数", maximum=24),
+            "stack": SpinWithLabel("朝圣言", "层数", maximum=TEAM_GAIN_LIMIT["朝圣言"]["stack"]),
             "rate": SpinWithLabel("朝圣言", "覆盖(%)", maximum=100),
             "variety": ComboWithLabel("朝圣言", "种类", ["", "朝圣言", "圣浴明心"])
         }
@@ -163,7 +164,7 @@ class TeamGainsWidget(QWidget):
         tab_layout.addWidget(self.team_gains["寒啸千军"]["rate"], 1, 0)
 
         self.team_gains["振奋"] = {
-            "stack": SpinWithLabel("振奋", "层数"),
+            "stack": SpinWithLabel("振奋", "层数", maximum=TEAM_GAIN_LIMIT["振奋"]["stack"]),
             "rate": SpinWithLabel("振奋", "覆盖(%)", maximum=100)
         }
         tab_layout.addWidget(self.team_gains["振奋"]["stack"], 2, 0)
@@ -174,7 +175,7 @@ class TeamGainsWidget(QWidget):
         tabs.addTab(tab, "长歌")
 
         self.team_gains["庄周梦"] = {
-            "stack": SpinWithLabel("庄周梦", "层数", maximum=133),
+            "stack": SpinWithLabel("庄周梦", "层数", maximum=TEAM_GAIN_LIMIT["庄周梦"]["stack"]),
             "rate": SpinWithLabel("庄周梦", "覆盖(%)", maximum=100)
         }
         tab_layout.addWidget(self.team_gains["庄周梦"]["stack"], 0, 0)
@@ -199,7 +200,7 @@ class TeamGainsWidget(QWidget):
         tab_layout.addWidget(self.team_gains["配伍"]["rate"], 0, 0)
 
         # self.team_gains["飘黄"] = {
-        #     "rate": SpinWithLabel("飘黄", "覆盖", maximum=int(100 / 6))
+        #     "rate": SpinWithLabel("飘黄", "覆盖", maximum=100)
         # }
         # tab_layout.addWidget(self.team_gains["飘黄"]["rate"], 1, 0)
 

qt/components/config.py

@@ -14,9 +14,13 @@ class ConfigWidget(QWidget):
 
         self.config_select = ComboWithLabel("选择预设方案")
         top_layout.addWidget(self.config_select, 1)
-        self.load_config = QPushButton("加载预设方案")
-        bottom_layout.addWidget(self.load_config, 1)
+        self.config_category = ComboWithLabel("选择导入类别", items=["全部", "装备", "消耗品", "增益"])
+        top_layout.addWidget(self.config_category, 1)
+        self.load_config = QPushButton("导入预设方案")
+        bottom_layout.addWidget(self.load_config, 2)
         self.config_name = TextWithLabel("设置预设方案")
-        top_layout.addWidget(self.config_name, 1)
+        top_layout.addWidget(self.config_name, 2)
         self.save_config = QPushButton("保存预设方案")
         bottom_layout.addWidget(self.save_config, 1)
+        self.delete_config = QPushButton("删除预设方案")
+        bottom_layout.addWidget(self.delete_config, 1)

qt/components/consumables.py

@@ -34,10 +34,10 @@ class ConsumablesWidget(QWidget):
         self.consumables['home_wine'] = self.home_wine
         layout.addWidget(self.home_wine, 1, 2)
 
-        self.guild_spread = RadioWithLabel("同泽宴", GUILD_FOOD)
+        self.guild_spread = RadioWithLabel("同泽宴", GUILD_SPREAD)
         self.consumables['guild_spread'] = self.guild_spread
         layout.addWidget(self.guild_spread, 2, 0)
-        self.guild_food = RadioWithLabel("蒸鱼餐盘", GUILD_SPREAD)
+        self.guild_food = RadioWithLabel("蒸鱼餐盘", GUILD_FOOD)
         self.consumables['guild_food'] = self.guild_food
         layout.addWidget(self.guild_food, 2, 1)
         self.spread = ComboWithLabel("宴席")

qt/components/dashboard.py

@@ -9,9 +9,9 @@ class DetailWidget(QWidget):
         super().__init__()
         layout = QVBoxLayout(self)
         self.details = {}
-        self.skill_combo = ComboWithLabel("选择技能")
+        self.skill_combo = ComboWithLabel("选择技能", info="技能名字/技能ID-技能等级-技能层数")
         layout.addWidget(self.skill_combo)
-        self.status_combo = ComboWithLabel("选择增益")
+        self.status_combo = ComboWithLabel("选择增益", info="增益名字/增益ID-增益等级-增益层数")
         layout.addWidget(self.status_combo)
         detail_table = QWidget()
         detail_table_layout = QHBoxLayout(detail_table)

qt/components/equipments.py

@@ -16,6 +16,7 @@ class EquipmentWidget(QWidget):
         self.equipment_json = json.load(open(os.path.join(EQUIPMENTS_DIR, self.position), encoding="utf-8"))
         self.equipment_mapping = {v['id']: k for k, v in self.equipment_json.items()}
         self.enchant_json = json.load(open(os.path.join(ENCHANTS_DIR, self.position), encoding="utf-8"))
+        self.enchant_mapping = {v['id']: k for k, v in self.enchant_json.items()}
         self.equipment = ComboWithLabel("装备")
         layout.addWidget(self.equipment)
 
@@ -32,7 +33,7 @@ class EquipmentWidget(QWidget):
             self.enchant = None
         else:
             self.enchant = ComboWithLabel("附魔")
-            self.enchant.combo_box.addItems([""] + list(self.enchant_json))
+            self.enchant.set_items([""] + list(self.enchant_json))
             input_layout.addWidget(self.enchant, 0, 0, 1, 2)
 
         if self.position not in SPECIAL_ENCHANT_POSITIONS:
@@ -61,7 +62,8 @@ class EquipmentWidget(QWidget):
             self.stones_json = json.load(open(STONES_DIR, encoding="utf-8"))
 
             self.stone_level = ComboWithLabel(
-                "五彩石等级", items=[str(i) for i in range(MAX_STONE_LEVEL + 1)])
+                "五彩石等级", items=[str(i) for i in range(MAX_STONE_LEVEL + 1)]
+            )
             self.stone_attrs = []
             input_layout.addWidget(self.stone_level, 2, 0)
             for i in range(MAX_STONE_ATTR):

qt/scripts/bonuses.py

@@ -24,7 +24,7 @@ def bonuses_script(parser: Parser, bonuses_widget: BonusesWidget):
         widget = bonuses_widget.formation
         formation = widget.formation.combo_box.currentText()
         core_rate = widget.core_rate.spin_box.value()
-        formation_rate = widget.formation_rate.spin_box.value()
+        formation_rate = widget.rate.spin_box.value()
 
         if formation == parser.school.formation:
             widget.core_rate.show()
@@ -37,9 +37,9 @@ def bonuses_script(parser: Parser, bonuses_widget: BonusesWidget):
         else:
             bonuses.pop("formation", None)
 
-    bonuses_widget.formation.formation.combo_box.currentIndexChanged.connect(formation_update)
+    bonuses_widget.formation.formation.combo_box.currentTextChanged.connect(formation_update)
     bonuses_widget.formation.core_rate.spin_box.valueChanged.connect(formation_update)
-    bonuses_widget.formation.formation_rate.spin_box.valueChanged.connect(formation_update)
+    bonuses_widget.formation.rate.spin_box.valueChanged.connect(formation_update)
 
     def radio_update(label):
         widget = bonuses_widget.team_gains[label]
@@ -75,7 +75,7 @@ def bonuses_script(parser: Parser, bonuses_widget: BonusesWidget):
         elif isinstance(bonus_widget, dict):
             for sub_bonus_widget in bonus_widget.values():
                 if isinstance(sub_bonus_widget, ComboWithLabel):
-                    sub_bonus_widget.combo_box.currentIndexChanged.connect(combine_update(bonus_label))
+                    sub_bonus_widget.combo_box.currentTextChanged.connect(combine_update(bonus_label))
                 elif isinstance(sub_bonus_widget, SpinWithLabel):
                     sub_bonus_widget.spin_box.valueChanged.connect(combine_update(bonus_label))
                 else:

qt/scripts/config.py

@@ -1,21 +1,26 @@
 import json
 import os
 
+from qt.components import ComboWithLabel, RadioWithLabel, SpinWithLabel
+from qt.components.bonuses import BonusesWidget
 from qt.components.config import ConfigWidget
 from qt.components.equipments import EquipmentsWidget
+from qt.components.consumables import ConsumablesWidget
+from qt.components.recipes import RecipesWidget
+from qt.components.talents import TalentsWidget
 from utils.parser import Parser
 
-
 if not os.path.exists("config"):
     CONFIG = {}
 else:
     CONFIG = json.load(open("config", encoding="utf-8"))
 
 
-def config_script(parser: Parser, config_widget: ConfigWidget, equipments_widget: EquipmentsWidget):
-    def load_config():
-        config_name = config_widget.config_select.combo_box.currentText()
-        config = CONFIG.get(parser.school.school, {}).get(config_name, {})
+def config_script(
+        parser: Parser, config_widget: ConfigWidget,
+        talent_widget: TalentsWidget, recipe_widget: RecipesWidget,
+        equipments_widget: EquipmentsWidget, consumable_widget: ConsumablesWidget, bonus_widget: BonusesWidget):
+    def load_equipments(config):
         if not config:
             return
 
@@ -43,18 +48,56 @@ def config_script(parser: Parser, config_widget: ConfigWidget, equipments_widget
                     index = equipment.stone_attrs[i].combo_box.findText(config[label]['stone_attrs'][i])
                     stone_attr.combo_box.setCurrentIndex(index)
 
+    def load_consumables(config):
+        for label, consumable in consumable_widget.items():
+            if isinstance(consumable, ComboWithLabel):
+                consumable.combo_box.setCurrentText(config[label])
+            elif isinstance(consumable, RadioWithLabel):
+                if consumable.radio_button.isChecked() != config[label]:
+                    consumable.radio_button.click()
+
+    def load_bonuses(config):
+        bonus_widget.formation.formation.combo_box.setCurrentText(config['formation']['formation'])
+        bonus_widget.formation.core_rate.spin_box.setValue(config['formation']['core_rate'])
+        bonus_widget.formation.rate.spin_box.setValue(config['formation']['rate'])
+        for label, team_gain in bonus_widget.team_gains.items():
+            if isinstance(team_gain, RadioWithLabel):
+                if team_gain.radio_button.isChecked() != config['team_gains'][label]:
+                    team_gain.radio_button.click()
+            elif isinstance(team_gain, dict):
+                for sub_label, sub_team_gain in team_gain.items():
+                    if isinstance(sub_team_gain, ComboWithLabel):
+                        sub_team_gain.combo_box.setCurrentText(config['team_gains'][label][sub_label])
+                    elif isinstance(sub_team_gain, SpinWithLabel):
+                        sub_team_gain.spin_box.setValue(config['team_gains'][label][sub_label])
+
+    def load_recipes(config):
+        for i, recipes in enumerate(config):
+            for selected_item in recipe_widget.recipes[i].list.selectedItems():
+                selected_item.setSelected(False)
+
+    def load_config():
+        config_name = config_widget.config_select.combo_box.currentText()
+        config = CONFIG.get(parser.school.school, {}).get(config_name, {})
+        if not config:
+            return
+        category = config_widget.config_category.combo_box.currentText()
+        if category == "全部":
+            load_equipments(config.get("equipments"))
+            load_consumables(config.get("consumables"))
+            load_bonuses(config.get("bonuses"))
+        elif category == "装备":
+            load_equipments(config.get("equipments"))
+        elif category == "消耗品":
+            load_consumables(config.get("consumables"))
+        elif category == "增益":
+            load_bonuses(config.get("bonuses"))
+
         config_widget.config_name.text_browser.setText(config_name)
 
     config_widget.load_config.clicked.connect(load_config)
 
-    def save_config():
-        config_name = config_widget.config_name.text_browser.text()
-        if parser.school.school not in CONFIG:
-            CONFIG[parser.school.school] = {}
-        if config_name not in CONFIG[parser.school.school]:
-            CONFIG[parser.school.school][config_name] = {}
-        config = CONFIG[parser.school.school][config_name]
-
+    def save_equipments(config):
         for label, equipment in equipments_widget.items():
             config[label] = {}
             if not (text := equipment.equipment.combo_box.currentText()):
@@ -76,13 +119,69 @@ def config_script(parser: Parser, config_widget: ConfigWidget, equipments_widget
                 config[label]['stone_attrs'] = [
                     stone_attr.combo_box.currentText() for stone_attr in equipment.stone_attrs
                 ]
+
+    def save_consumables(config):
+        for label, consumable in consumable_widget.items():
+            if isinstance(consumable, ComboWithLabel):
+                config[label] = consumable.combo_box.currentText()
+            elif isinstance(consumable, RadioWithLabel):
+                config[label] = consumable.radio_button.isChecked()
+
+    def save_bonuses(config):
+        config['formation']['formation'] = bonus_widget.formation.formation.combo_box.currentText()
+        config['formation']['core_rate'] = bonus_widget.formation.core_rate.spin_box.value()
+        config['formation']['rate'] = bonus_widget.formation.rate.spin_box.value()
+        for label, team_gain in bonus_widget.team_gains.items():
+            if isinstance(team_gain, RadioWithLabel):
+                config['team_gains'][label] = team_gain.radio_button.isChecked()
+            elif isinstance(team_gain, dict):
+                config['team_gains'][label] = {}
+                for sub_label, sub_team_gain in team_gain.items():
+                    if isinstance(sub_team_gain, ComboWithLabel):
+                        config['team_gains'][label][sub_label] = sub_team_gain.combo_box.currentText()
+                    elif isinstance(sub_team_gain, SpinWithLabel):
+                        config['team_gains'][label][sub_label] = sub_team_gain.spin_box.value()
+
+    def save_recipes(config):
+        for recipe in recipe_widget.values():
+            if selected_items := recipe.list.selectedItems():
+                config.append(selected_items)
+
+    def save_config():
+        config_name = config_widget.config_name.text_browser.text()
+        if parser.school.school not in CONFIG:
+            CONFIG[parser.school.school] = {}
+        if config_name not in CONFIG[parser.school.school]:
+            CONFIG[parser.school.school][config_name] = {
+                "equipments": {},
+                "consumables": {},
+                "bonuses": {"formation": {}, "team_gains": {}},
+                "talents": [],
+                "recipes": []
+            }
+
+        save_equipments(CONFIG[parser.school.school][config_name]['equipments'])
+        save_consumables(CONFIG[parser.school.school][config_name]['consumables'])
+        save_bonuses(CONFIG[parser.school.school][config_name]['bonuses'])
+        # save_recipes(CONFIG[parser.school.school][config_name]['recipes'])
         json.dump(CONFIG, open("config", "w", encoding="utf-8"), ensure_ascii=False)
 
-        config_choices = list(CONFIG.get(parser.school.school, {}))
-        if current_select := config_widget.config_select.combo_box.currentText():
-            default_index = config_choices.index(current_select)
-        else:
-            default_index = -1
-        config_widget.config_select.set_items(config_choices, default_index=default_index)
+        config_widget.config_select.set_items(
+            list(CONFIG.get(parser.school.school, {})), keep_index=True, default_index=-1
+        )
 
     config_widget.save_config.clicked.connect(save_config)
+
+    def delete_config():
+        config_name = config_widget.config_name.text_browser.text()
+        if config_name not in CONFIG.get(parser.school.school, {}):
+            return
+
+        CONFIG[parser.school.school].pop(config_name)
+
+        json.dump(CONFIG, open("config", "w", encoding="utf-8"), ensure_ascii=False)
+
+        config_widget.config_select.set_items(list(CONFIG.get(parser.school.school, {})), default_index=-1)
+        config_widget.config_name.text_browser.clear()
+
+    config_widget.delete_config.clicked.connect(delete_config)

qt/scripts/consumables.py

@@ -45,7 +45,7 @@ def consumables_script(consumables_widget: ConsumablesWidget):
     for consumable_label, consumable_widget in consumables_widget.items():
 
         if isinstance(consumable_widget, ComboWithLabel):
-            consumable_widget.combo_box.currentIndexChanged.connect(consumable_combo_update(consumable_label))
+            consumable_widget.combo_box.currentTextChanged.connect(consumable_combo_update(consumable_label))
         elif isinstance(consumable_widget, RadioWithLabel):
             consumable_widget.radio_button.clicked.connect(consumable_radio_update(consumable_label))
 

qt/scripts/dashboard.py

@@ -99,25 +99,15 @@ def dashboard_script(parser: Parser,
 
     def set_skills():
         detail_widget = dashboard_widget.detail_widget
-        skill = detail_widget.skill_combo.combo_box.currentText()
-        skill_choices = list(detail_widget.details)
-        if skill in skill_choices:
-            default_index = skill_choices.index(skill)
-        else:
-            default_index = -1
-        detail_widget.skill_combo.set_items(skill_choices, default_index=default_index)
+        detail_widget.skill_combo.set_items(list(detail_widget.details), keep_index=True, default_index=-1)
         set_status(None)
 
     def set_status(_):
         detail_widget = dashboard_widget.detail_widget
         skill = detail_widget.skill_combo.combo_box.currentText()
-        status = detail_widget.status_combo.combo_box.currentText()
-        status_choices = list(detail_widget.details.get(skill, {}))
-        if status in status_choices:
-            default_index = status_choices.index(status)
-        else:
-            default_index = -1
-        detail_widget.status_combo.set_items(status_choices, default_index=default_index)
+        detail_widget.status_combo.set_items(
+            list(detail_widget.details.get(skill, {})), keep_index=True, default_index=-1
+        )
         set_detail(None)
 
     dashboard_widget.detail_widget.skill_combo.combo_box.currentTextChanged.connect(set_status)

qt/scripts/top.py

@@ -10,8 +10,6 @@ from qt.components.equipments import EquipmentsWidget
 from qt.components.recipes import RecipesWidget
 from qt.components.talents import TalentsWidget
 from qt.components.top import TopWidget
-# from general.consumables import FOODS, POTIONS, WEAPON_ENCHANTS, SPREADS, SNACKS, WINES
-# from general.gains.formation import FORMATIONS
 from qt.constant import MAX_RECIPES, MAX_STONE_LEVEL
 from qt.scripts.config import CONFIG
 from utils.parser import Parser
@@ -42,8 +40,10 @@ def top_script(
         for i, talent_widget in enumerate(talents_widget.values()):
             talents = school.talents[i]
             default_index = talents.index(parser.select_talents[i]) + 1
-            talent_widget.set_items([""] + [school.talent_decoder[talent] for talent in talents],
-                                    default_index=default_index)
+            talent_widget.set_items(
+                [""] + [school.talent_decoder[talent] for talent in talents],
+                keep_index=True, default_index=default_index
+            )
 
         """ Update recipe options """
         for recipe_widget in recipes_widget.values():
@@ -58,7 +58,7 @@ def top_script(
             recipes_widget[i].show()
 
         """ Update equipment options """
-        for equipment_widget in equipments_widget.values():
+        for label, equipment_widget in equipments_widget.items():
             choices = [""]
             for name, detail in equipment_widget.equipment_json.items():
                 if detail['kind'] not in (school.kind, school.major):
@@ -66,28 +66,34 @@ def top_script(
                 if detail['school'] not in ("精简", "通用", school.school):
                     continue
                 choices.append(name)
-            current_equipment = equipment_widget.equipment.combo_box.currentText()
-            if current_equipment in choices:
-                default_index = choices.index(current_equipment)
-            else:
-                default_index = -1
-            equipment_widget.equipment.set_items(choices, default_index=default_index)
-
+            equipment_widget.equipment.set_items(choices, keep_index=True)
             if equipment_widget.stones_json:
-                equipment_widget.stone_level.combo_box.setCurrentIndex(MAX_STONE_LEVEL)
+                if not (current_index := equipment_widget.stone_level.combo_box.currentIndex()):
+                    current_index = MAX_STONE_LEVEL
+                equipment_widget.stone_level.combo_box.setCurrentIndex(current_index)
+            if select_equipment := parser.select_equipments.get(label, {}):
+                if equipment := equipment_widget.equipment_mapping.get(select_equipment['equipment']):
+                    if equipment in equipment_widget.equipment.items:
+                        equipment_widget.equipment.combo_box.setCurrentText(equipment)
+                if enchant := equipment_widget.enchant_mapping.get(select_equipment['enchant']):
+                    if enchant in equipment_widget.enchant.items:
+                        equipment_widget.enchant.combo_box.setCurrentText(enchant)
+                equipment_widget.strength_level.combo_box.setCurrentIndex(select_equipment['strength_level'])
+                for i, embed_level in enumerate(select_equipment['embed_levels']):
+                    equipment_widget.embed_levels[i].combo_box.setCurrentIndex(embed_level)
 
         """ Update consumable options """
-        consumables_widget.major_food.set_items([""] + FOODS[school.major])
-        consumables_widget.minor_food.set_items([""] + FOODS[school.kind] + FOODS[""])
-        consumables_widget.major_potion.set_items([""] + POTIONS[school.major])
-        consumables_widget.minor_potion.set_items([""] + POTIONS[school.kind] + POTIONS[""])
-        consumables_widget.weapon_enchant.set_items([""] + WEAPON_ENCHANTS[school.kind])
-        consumables_widget.home_snack.set_items([""] + SNACKS[school.kind] + SNACKS[""])
-        consumables_widget.home_wine.set_items([""] + WINES[school.major] + WINES[""])
-        consumables_widget.spread.set_items([""] + SPREADS[school.major] + SPREADS[school.kind])
+        consumables_widget.major_food.set_items([""] + FOODS[school.major], keep_index=True)
+        consumables_widget.minor_food.set_items([""] + FOODS[school.kind] + FOODS[""], keep_index=True)
+        consumables_widget.major_potion.set_items([""] + POTIONS[school.major], keep_index=True)
+        consumables_widget.minor_potion.set_items([""] + POTIONS[school.kind] + POTIONS[""], keep_index=True)
+        consumables_widget.weapon_enchant.set_items([""] + WEAPON_ENCHANTS[school.kind], keep_index=True)
+        consumables_widget.home_snack.set_items([""] + SNACKS[school.kind] + SNACKS[""], keep_index=True)
+        consumables_widget.home_wine.set_items([""] + WINES[school.major] + WINES[""], keep_index=True)
+        consumables_widget.spread.set_items([""] + SPREADS[school.major] + SPREADS[school.kind], keep_index=True)
 
         """ Update bonus options """
-        bonus_widget.formation.formation.set_items([""] + FORMATIONS[school.kind] + FORMATIONS[""])
+        bonus_widget.formation.formation.set_items([""] + FORMATIONS[school.kind] + FORMATIONS[""], keep_index=True)
         config_widget.show()
         bottom_widget.show()
 

requirements.txt

@@ -0,0 +1,3 @@
+pyside6==6.7.0
+tqdm==4.66.2
+requests==2.31.0

schools/bei_ao_jue/skills.py

@@ -343,7 +343,7 @@ SKILLS: Dict[int, Skill | dict] = {
         "attack_power_cof": [60 * 1.45 * 1.1 * 0.7] +
                             [(60 + (i - 1) * 10) * 1.45 * 1.1 * 0.7 for i in range(2, 10)] +
                             [160 * 1.45 * 0.9 * 1.1 * 0.7],
-        "weapon_damage_cof": 1024 * 1.45 * 0.25
+        # "weapon_damage_cof": 1024 * 1.45 * 0.25
     },
     37458: {
         "skill_class": PhysicalDamage,

schools/bei_ao_jue/talents.py

@@ -10,13 +10,15 @@ class 冥鼓(Gain):
         for skill_id in (16760, 16382, 20991):
             skills[skill_id].skill_damage_addition += 205
             skills[skill_id].skill_shield_gain -= 512
-        skills[32823].skill_shield_gain = [0, 0, -512, -512]
+        skills[32823].skill_shield_gain = [-512, 0, 0, -512]
+        skills[37458].skill_shield_gain -= 512
 
     def sub_skills(self, skills: Dict[int, Skill]):
         for skill_id in [16760, 16382, 20991]:
             skills[skill_id].skill_damage_addition -= 205
             skills[skill_id].skill_shield_gain += 512
         skills[32823].skill_shield_gain = 0
+        skills[37458].skill_shield_gain += 512
 
 
 class 阳关(Gain):

utils/analyzer.py

@@ -118,7 +118,6 @@ def analyze_details(record, duration: int, attribute: Attribute, school: School)
                 skill_total.gradients[attr] += residual_damage * len(timeline)
 
         total.expected_damage += skill_total.expected_damage
-        total.count += skill_total.count
         skill_summary.expected_damage += skill_total.expected_damage
         skill_summary.critical_count += skill_total.critical_strike
         skill_summary.count += skill_total.count

utils/parser.py

@@ -76,6 +76,23 @@ SUPPORT_SCHOOL = {
 }
 
 
+LABEL_MAPPING = {
+    2: "远程武器",
+    3: "上衣",
+    4: "帽子",
+    5: "项链",
+    6: "戒指1",
+    7: "戒指2",
+    8: "腰带",
+    9: "腰坠",
+    10: "下装",
+    11: "鞋子",
+    12: "护腕",
+    0: "近战武器"
+}
+EMBED_MAPPING = {(5, 24449 - i): 8 - i for i in range(8)}
+
+
 class Parser:
     records: list
     status: dict
@@ -90,6 +107,7 @@ class Parser:
     fight_flag: bool
 
     select_talents: List[int]
+    select_equipments: Dict[int, Dict[str, int | list]]
 
     school: School | None
 
@@ -135,11 +153,23 @@ class Parser:
 
         self.school = None
 
+    def parse_equipments(self, detail):
+        self.select_equipments = {}
+        for row in detail:
+            if not (label := LABEL_MAPPING.get(row[0])):
+                continue
+            select_equipment = self.select_equipments[label] = {}
+            select_equipment['equipment'] = row[2]
+            select_equipment['strength_level'] = row[3]
+            select_equipment['embed_levels'] = [EMBED_MAPPING.get(tuple(e), 0) for e in row[4]]
+            select_equipment['enchant'] = row[5]
+
     def parse_info(self, detail):
         if isinstance(detail, list):
             self.school = SUPPORT_SCHOOL.get(detail[3])
             if not self.school:
                 raise AttributeError(f"Cannot support {detail[3]} now")
+            self.parse_equipments(detail[5])
             self.select_talents = [row[1] for row in detail[6]]
             return self.school