opt: better Tighnari's tf

Author: CortinthusYu

mona_core/src/character/characters/dendro/tighnari.rs

@@ -116,6 +116,7 @@ damage_enum!(
     Charged2
     Charged3
     Charged4
+    ChargedC6
     Plunging1
     Plunging2
     Plunging3
@@ -128,7 +129,7 @@ impl TighnariDamageEnum {
     pub fn get_element(&self) -> Element {
         use TighnariDamageEnum::*;
         match *self {
-            Charged2 | Charged3 | Charged4 | E1 | Q1 | Q2 => Element::Dendro,
+            Charged2 | Charged3 | Charged4 | ChargedC6 | E1 | Q1 | Q2 => Element::Dendro,
             _ => Element::Physical
         }
     }
@@ -137,7 +138,7 @@ impl TighnariDamageEnum {
         use TighnariDamageEnum::*;
         match *self {
             Normal1 | Normal2 | Normal3 | Normal4 => SkillType::NormalAttack,
-            Charged1 | Charged2 | Charged3 | Charged4 => SkillType::ChargedAttack,
+            Charged1 | Charged2 | Charged3 | Charged4 | ChargedC6 => SkillType::ChargedAttack,
             E1 => SkillType::ElementalSkill,
             Plunging1 | Plunging2 | Plunging3 => SkillType::PlungingAttack,
             Q1 | Q2 => SkillType::ElementalBurst
@@ -191,6 +192,7 @@ impl CharacterTrait for Tighnari {
             CharacterSkillMapItem { index: TighnariDamageEnum::Charged2 as usize, text: locale!(zh_cn: "一段蓄力瞄准射击", en: "Level 1 Aimed Shot") },
             CharacterSkillMapItem { index: TighnariDamageEnum::Charged3 as usize, text: locale!(zh_cn: "花筥箭伤害", en: "Wreath Arrow DMG") },
             CharacterSkillMapItem { index: TighnariDamageEnum::Charged4 as usize, text: locale!(zh_cn: "藏蕴花矢伤害", en: "Clusterbloom Arrow DMG") },
+            CharacterSkillMapItem { index: TighnariDamageEnum::ChargedC6 as usize, text: locale!(zh_cn: "六命藏蕴花矢伤害", en: "C6 Clusterbloom Arrow DMG") },
             CharacterSkillMapItem { index: TighnariDamageEnum::Plunging1 as usize, text: plunging_dmg!(1) },
             CharacterSkillMapItem { index: TighnariDamageEnum::Plunging2 as usize, text: plunging_dmg!(2) },
             CharacterSkillMapItem { index: TighnariDamageEnum::Plunging3 as usize, text: plunging_dmg!(3) },
@@ -238,6 +240,7 @@ impl CharacterTrait for Tighnari {
             Charged2 => TIGHNARI_SKILL.charged_dmg2[s1],
             Charged3 => TIGHNARI_SKILL.charged_dmg3[s1],
             Charged4 => TIGHNARI_SKILL.charged_dmg4[s1],
+            ChargedC6 => 1.5,
             Plunging1 => TIGHNARI_SKILL.plunging_dmg1[s1],
             Plunging2 => TIGHNARI_SKILL.plunging_dmg2[s1],
             Plunging3 => TIGHNARI_SKILL.plunging_dmg3[s1],

mona_core/src/target_functions/target_function_config.rs

@@ -50,7 +50,7 @@ pub enum TargetFunctionConfig {
     ZhongliDefault { recharge_demand: f64 },
     KujouSaraDamage { recharge_demand: f64 },
     KukiShinobuDefault { e_ratio: f64 },
-    TighnariDefault { spread_rate: f64 },
+    // TighnariDefault { spread_rate: f64 },
     CynoDefault { recharge_requirement: f64, combo: usize, until_expire: bool, aggravate_rate: f64, elecharged_rate: f64, overload_rate: f64, hyperbloom_rate: f64 },
     KeqingDefault { aggravate_rate: f64 },
     NilouDefault { e_ratio: f64, q_ratio: f64, bloom_ratio: f64, other_em: f64, other_bloom_ratio: f64 },

mona_core/src/target_functions/target_functions/dendro/tighnari_default.rs

@@ -18,9 +18,7 @@ use crate::team::TeamQuantization;
 use crate::weapon::Weapon;
 use crate::weapon::weapon_common_data::WeaponCommonData;
 
-pub struct TighnariDefaultTargetFunction {
-    pub spread_rate: f64,
-}
+pub struct TighnariDefaultTargetFunction;
 
 impl TargetFunction for TighnariDefaultTargetFunction {
     fn get_target_function_opt_config(&self) -> TargetFunctionOptConfig {
@@ -38,10 +36,22 @@ impl TargetFunction for TighnariDefaultTargetFunction {
         };
 
         type S = <Tighnari as CharacterTrait>::DamageEnumType;
-        let dmg_b = Tighnari::damage::<SimpleDamageBuilder>(&&context, S::Charged3, &CharacterSkillConfig::NoConfig, None);
+        let dmg_c3 = Tighnari::damage::<SimpleDamageBuilder>(&&context, S::Charged3, &CharacterSkillConfig::NoConfig, None);
+        let dmg_c4 = Tighnari::damage::<SimpleDamageBuilder>(&&context, S::Charged4, &CharacterSkillConfig::NoConfig, None);
+        let dmg_cc6: f64 = if character.common_data.constellation == 6 { Tighnari::damage::<SimpleDamageBuilder>(&&context, S::ChargedC6, &CharacterSkillConfig::NoConfig, None).spread.unwrap().expectation} else { 0.0 };
+        let dmg_q1 = Tighnari::damage::<SimpleDamageBuilder>(&&context, S::Q1, &CharacterSkillConfig::NoConfig, None);
+        let dmg_q2 = Tighnari::damage::<SimpleDamageBuilder>(&&context, S::Q2, &CharacterSkillConfig::NoConfig, None);
+        let dmg_e = Tighnari::damage::<SimpleDamageBuilder>(&&context, S::E1, &CharacterSkillConfig::NoConfig, None);
+
+        let dmg = 
+        dmg_c3.spread.unwrap().expectation + 
+        dmg_c4.spread.unwrap().expectation +
+        dmg_c4.normal.expectation * 3.0 + dmg_cc6 +
+        dmg_q1.spread.unwrap().expectation + dmg_q2.spread.unwrap().expectation +
+        (dmg_q1.normal.expectation + dmg_q2.normal.expectation) * 5.0 +
+        dmg_e.spread.unwrap().expectation;
 
-        let normal_rate = 1.0 - self.spread_rate;
-        let dmg = dmg_b.normal.expectation * normal_rate + dmg_b.spread.unwrap().expectation * self.spread_rate;
+        
 
         dmg
     }
@@ -56,31 +66,31 @@ impl TargetFunctionMetaTrait for TighnariDefaultTargetFunction {
             en: "Tighnari-Verdant Strider"
         ),
         description: crate::common::i18n::locale!(
-            zh_cn: "使得提纳里的重击伤害最大",
-            en: "Maximize Tighnari Charged Attack"
+            zh_cn: "最大化激化ezzzq一套的总伤害,如果非六命用猎人之径则把覆盖率调到0.8，六命猎人之径覆盖率调到0.7",
+            en: "Maximize ecccq Combo DMG with Spread, when Hunter's Path is equiped, if you are C6, set coverage to 0.7, else set it to 0.8"
         ),
         tags: "",
         four: TargetFunctionFor::SomeWho(CharacterName::Tighnari),
         image: TargetFunctionMetaImage::Avatar
     };
 
-    #[cfg(not(target_family = "wasm"))]
-    const CONFIG: Option<&'static [ItemConfig]> = Some(&[
-        ItemConfig {
-            name: "spread_rate",
-            title: locale!(
-                zh_cn: "蔓激化比例",
-                en: "Spread Ratio",
-            ),
-            config: ItemConfigType::Float { min: 0.0, max: 1.0, default: 0.0 }
-        }
-    ]);
+    // #[cfg(not(target_family = "wasm"))]
+    // const CONFIG: Option<&'static [ItemConfig]> = Some(&[
+    //     ItemConfig {
+    //         name: "spread_rate",
+    //         title: locale!(
+    //             zh_cn: "蔓激化比例",
+    //             en: "Spread Ratio",
+    //         ),
+    //         config: ItemConfigType::Float { min: 0.0, max: 1.0, default: 0.0 }
+    //     }
+    // ]);
 
     fn create(character: &CharacterCommonData, weapon: &WeaponCommonData, config: &TargetFunctionConfig) -> Box<dyn TargetFunction> {
-        let spread_rate = match *config {
-            TargetFunctionConfig::TighnariDefault { spread_rate } => spread_rate,
-            _ => 0.0
-        };
-        Box::new(TighnariDefaultTargetFunction { spread_rate: spread_rate.clamp(0.0, 1.0) })
+        // let spread_rate = match *config {
+        //     TargetFunctionConfig::TighnariDefault { spread_rate } => spread_rate,
+        //     _ => 0.0
+        // };
+        Box::new(TighnariDefaultTargetFunction)
     }
 }