04.25 commit

base/buff.py

@@ -20,7 +20,6 @@ class Buff:
     gain_attributes: ATTR_DICT = None
 
     SNAPSHOT_ATTRS = ["attack_power", "critical_strike", "critical_power", "strain", "damage_addition"]
-    PET_ATTRS = ["attack_power", "critical_power", "overcome", "strain"]
 
     def __post_init__(self):
         if self.gain_skills is None:

general/gains/formation.py

@@ -167,7 +167,7 @@ class 霜岚洗锋阵(FormationGain):
 class 墟海引归阵(FormationGain):
     gain_attributes = {
         "physical_critical_strike_gain": 300,
-        "physical_attack_power_gain": 154,
+        "physical_attack_power_gain": 133,
         "physical_overcome_gain": 102
     }
     core_gain_attributes = {"physical_attack_power_gain": 51}

schools/shan_hai_xin_jue/buffs.py

@@ -16,7 +16,14 @@ BUFFS: Dict[int, Buff | dict] = {
         "gain_attributes": {
             "all_damage_addition": 62
         }
-    }
+    },
+    27099: {
+        "buff_name": "诸怀",
+        "gain_attributes": {
+            "all_shield_ignore": 205,
+            "physical_attack_power_gain": 102
+        }
+    },
 }
 
 for buff_id, detail in BUFFS.items():

schools/shan_hai_xin_jue/talents.py

@@ -66,6 +66,7 @@ TALENT_GAINS: Dict[int, Gain] = {
     35725: Gain("长右"),
     35729: Gain("鹿蜀"),
     35736: 桑柘("桑柘"),
+    35733: Gain("诸怀"),
     35737: Gain("于狩"),
     35745: 卢令("卢令"),
     35749: Gain("托月"),
@@ -81,7 +82,7 @@ TALENTS = [
     [35721],
     [35725],
     [35729],
-    [35736],
+    [35736, 35733],
     [35737],
     [35745],
     [35749],

utils/analyzer.py

@@ -119,18 +119,19 @@ def analyze_details(record, duration: int, attribute: Attribute, school: School)
 
         if skill_total.count:
             total.expected_damage += skill_total.expected_damage
-            skill_summary.expected_damage += skill_total.expected_damage
-            skill_summary.critical_count += skill_total.critical_strike
-            skill_summary.count += skill_total.count
             skill_total.damage /= skill_total.count
             skill_total.critical_damage /= skill_total.count
             skill_total.expected_damage /= skill_total.count
             skill_total.critical_strike /= 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
+            for attr, residual_damage in skill_total.gradients.items():
+                total.gradients[attr] += residual_damage
+                skill_total.gradients[attr] /= skill_total.count
         else:
+            details.pop(skill.display_name)
             summary.pop(skill_name)
-        for attr, residual_damage in skill_total.gradients.items():
-            total.gradients[attr] += residual_damage
-            skill_total.gradients[attr] /= skill_total.count
 
     return total, summary, details