Skip to content

Commit

Permalink
fix: SkillType
Browse files Browse the repository at this point in the history
  • Loading branch information
@wormtql
wormtql committed Jan 30, 2024
1 parent 018d649 commit a3faefd
Show file tree
Hide file tree
Showing 83 changed files with 171 additions and 250 deletions.
16 changes: 8 additions & 8 deletions mona_core/src/attribute/attribute_name.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ pub enum AttributeName {
ExtraDmgNormalAttack,
ExtraDmgChargedAttack,
ExtraDmgPlungingAttack,
ExtraDmgPlungingAttack3, // 坠地冲击额外伤害，由于闲云而首次引进
ExtraDmgPlungingAttackLowHigh, // 坠地冲击额外伤害，由于闲云而首次引进
ExtraDmgElementalSkill,
ExtraDmgElementalBurst,
ExtraDmgElectro,
Expand Down Expand Up @@ -193,7 +193,7 @@ impl AttributeName {
match skill_type {
SkillType::NormalAttack => AttributeName::BonusNormalAttack,
SkillType::ChargedAttack => AttributeName::BonusChargedAttack,
SkillType::PlungingAttackLow | SkillType::PlungingAttackHigh | SkillType::PlungingAttackGround => AttributeName::BonusPlungingAttack,
SkillType::PlungingAttackOnGround | SkillType::PlungingAttackInAction => AttributeName::BonusPlungingAttack,
SkillType::ElementalSkill => AttributeName::BonusElementalSkill,
SkillType::ElementalBurst => AttributeName::BonusElementalBurst,
}
Expand All @@ -216,7 +216,7 @@ impl AttributeName {
match skill_type {
SkillType::NormalAttack => AttributeName::CriticalNormalAttack,
SkillType::ChargedAttack => AttributeName::CriticalChargedAttack,
SkillType::PlungingAttackLow | SkillType::PlungingAttackHigh | SkillType::PlungingAttackGround => AttributeName::CriticalPlungingAttack,
SkillType::PlungingAttackOnGround | SkillType::PlungingAttackInAction => AttributeName::CriticalPlungingAttack,
SkillType::ElementalSkill => AttributeName::CriticalElementalSkill,
SkillType::ElementalBurst => AttributeName::CriticalElementalBurst,
}
Expand All @@ -239,7 +239,7 @@ impl AttributeName {
match skill_type {
SkillType::NormalAttack => AttributeName::CriticalDamageNormalAttack,
SkillType::ChargedAttack => AttributeName::CriticalDamageChargedAttack,
SkillType::PlungingAttackLow | SkillType::PlungingAttackHigh | SkillType::PlungingAttackGround => AttributeName::CriticalDamagePlungingAttack,
SkillType::PlungingAttackOnGround | SkillType::PlungingAttackInAction => AttributeName::CriticalDamagePlungingAttack,
SkillType::ElementalSkill => AttributeName::CriticalDamageElementalSkill,
SkillType::ElementalBurst => AttributeName::CriticalDamageElementalBurst,
}
Expand All @@ -262,7 +262,7 @@ impl AttributeName {
match skill_type {
SkillType::NormalAttack => AttributeName::HPRatioNormalAttack,
SkillType::ChargedAttack => AttributeName::HPRatioChargedAttack,
SkillType::PlungingAttackLow | SkillType::PlungingAttackHigh | SkillType::PlungingAttackGround => AttributeName::HPRatioPlungingAttack,
SkillType::PlungingAttackOnGround | SkillType::PlungingAttackInAction => AttributeName::HPRatioPlungingAttack,
SkillType::ElementalSkill => AttributeName::HPRatioElementalSkill,
SkillType::ElementalBurst => AttributeName::HPRatioElementalBurst,
}
Expand All @@ -285,7 +285,7 @@ impl AttributeName {
match skill_type {
SkillType::NormalAttack => AttributeName::DEFRatioNormalAttack,
SkillType::ChargedAttack => AttributeName::DEFRatioChargedAttack,
SkillType::PlungingAttackLow | SkillType::PlungingAttackHigh | SkillType::PlungingAttackGround => AttributeName::DEFRatioPlungingAttack,
SkillType::PlungingAttackOnGround | SkillType::PlungingAttackInAction => AttributeName::DEFRatioPlungingAttack,
SkillType::ElementalSkill => AttributeName::DEFRatioElementalSkill,
SkillType::ElementalBurst => AttributeName::DEFRatioElementalBurst,
}
Expand All @@ -308,7 +308,7 @@ impl AttributeName {
match skill_type {
SkillType::NormalAttack => AttributeName::ATKRatioNormalAttack,
SkillType::ChargedAttack => AttributeName::ATKRatioChargedAttack,
SkillType::PlungingAttackLow | SkillType::PlungingAttackHigh | SkillType::PlungingAttackGround => AttributeName::ATKRatioPlungingAttack,
SkillType::PlungingAttackOnGround | SkillType::PlungingAttackInAction => AttributeName::ATKRatioPlungingAttack,
SkillType::ElementalSkill => AttributeName::ATKRatioElementalSkill,
SkillType::ElementalBurst => AttributeName::ATKRatioElementalBurst,
}
Expand All @@ -331,7 +331,7 @@ impl AttributeName {
match skill_type {
SkillType::NormalAttack => AttributeName::ExtraDmgNormalAttack,
SkillType::ChargedAttack => AttributeName::ExtraDmgChargedAttack,
SkillType::PlungingAttackLow | SkillType::PlungingAttackHigh | SkillType::PlungingAttackGround => AttributeName::ExtraDmgPlungingAttack,
SkillType::PlungingAttackOnGround | SkillType::PlungingAttackInAction => AttributeName::ExtraDmgPlungingAttack,
SkillType::ElementalSkill => AttributeName::ExtraDmgElementalSkill,
SkillType::ElementalBurst => AttributeName::ExtraDmgElementalBurst,
}
Expand Down
2 changes: 1 addition & 1 deletion mona_core/src/buffs/buffs/character/xianyun.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ impl<A: Attribute> Buff<A> for BuffXianyunTalent2 {
fn change_attribute(&self, attribute: &mut A) {
let factor = if self.c2 { 2.0 } else { 1.0 };
let dmg = (9000.0_f64 * factor).min(self.atk * 2.0 * factor);
attribute.set_value_by(AttributeName::ExtraDmgPlungingAttack3, "闲云天赋2「细想应是洞中仙」", dmg);
attribute.set_value_by(AttributeName::ExtraDmgPlungingAttackLowHigh, "闲云天赋2「细想应是洞中仙」", dmg);
}
}

Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/anemo/faruzan.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,8 @@ impl FaruzanDamageEnum {
use FaruzanDamageEnum::*;
match *self {
E1 | E2 => SkillType::ElementalSkill,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
Charged1 | Charged2 => SkillType::ChargedAttack,
Normal1 | Normal2 | Normal3 | Normal4 => SkillType::NormalAttack,
Q1 => SkillType::ElementalBurst,
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/anemo/jean.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,8 @@ impl JeanDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 | Normal4 | Normal5 => SkillType::NormalAttack,
Charged => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 => SkillType::ElementalSkill,
Q1 | Q2 | QHeal1 | QHeal2 => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/anemo/kaedehara_kazuha.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,8 @@ impl KaedeharaKazuhaDamageEnum {
match *self {
Normal1 | Normal2 | Normal31 | Normal32 | Normal4 | Normal5 => SkillType::NormalAttack,
Charged11 | Charged12 => SkillType::ChargedAttack,
Plunging1 | PlungingE1 => SkillType::PlungingAttackLow,
Plunging2 | PlungingE2 => SkillType::PlungingAttackHigh,
Plunging3 | PlungingE3 | PlungingPyro | PlungingHydro | PlungingElectro | PlungingCryo => SkillType::PlungingAttackGround,
Plunging1 | PlungingE1 => SkillType::PlungingAttackInAction,
Plunging2 | PlungingE2 | Plunging3 | PlungingE3 | PlungingPyro | PlungingHydro | PlungingElectro | PlungingCryo => SkillType::PlungingAttackOnGround,
E1 | E2 => SkillType::ElementalSkill,
Q1 | Q2 | Q3Hydro | Q3Pyro | Q3Cryo | Q3Electro => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/anemo/lynette.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,8 @@ impl LynetteDamageEnum {
match *self {
Normal1 | Normal2 | Normal31 | Normal32 | Normal4 => SkillType::NormalAttack,
Charged11 | Charged12 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 | E2 | EHeal => SkillType::ElementalSkill,
Q1 | Q2 | Q3 | Q3Hydro | Q3Pyro | Q3Electro | Q3Cryo => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/anemo/sayu.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,8 @@ impl SayuDamageEnum {
match *self {
Normal1 | Normal2 | Normal31 | Normal32 | Normal4 => SkillType::NormalAttack,
Charged1 | Charged2 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
Q1 | QHeal1 | Q2 | QHeal2 => SkillType::ElementalBurst,
_ => SkillType::ElementalSkill
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/anemo/shikanoin_heizou.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,8 @@ impl ShikanoinHeizouDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 | Normal41 | Normal42 | Normal43 | Normal4 | Normal5 => SkillType::NormalAttack,
Charged1 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E0 | E1 | E2 | E3 | E4 => SkillType::ElementalSkill,
Q1 | Q2Cryo | Q2Hydro | Q2Pyro | Q2Electro => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/anemo/sucrose.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,8 @@ impl SucroseDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 | Normal4 => SkillType::NormalAttack,
Charged => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 => SkillType::ElementalSkill,
Q1 | Q2Cryo | Q2Hydro | Q2Pyro | Q2Electro => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/anemo/venti.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,8 @@ impl VentiDamageEnum {
match *self {
Normal1 | Normal11 | Normal12 | Normal2 | Normal3 | Normal41 | Normal42 | Normal4 | Normal5 | Normal6 => SkillType::NormalAttack,
Charged1 | Charged2 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 | E2 => SkillType::ElementalSkill,
Q1 | Q2Pyro | Q2Electro | Q2Hydro | Q2Cryo => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/anemo/wanderer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@ impl WandererDamageEnum {
use WandererDamageEnum::*;
match *self {
E1 | Dash1 => SkillType::ElementalSkill, //TODO: dash1 => e not confirmed
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
Charged1 => SkillType::ChargedAttack,
Normal1 | Normal2 | Normal3 | Normal1C6 | Normal2C6 | Normal3C6 => SkillType::NormalAttack,
Q1 => SkillType::ElementalBurst,
Expand Down
7 changes: 3 additions & 4 deletions mona_core/src/character/characters/anemo/xianyun.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,8 @@ impl XianyunDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 | Normal4 => SkillType::NormalAttack,
Charged | Charged1 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 | E2 | E3 | E4 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 | E2 | E3 | E4 => SkillType::PlungingAttackOnGround,
E1 | E5 => SkillType::ElementalSkill,
Q1 | Q2 | QHeal1 | QHeal2 => SkillType::ElementalBurst
}
Expand Down Expand Up @@ -125,7 +124,7 @@ impl<A: Attribute> ChangeAttribute<A> for XianyunEffect {
let factor = if self.constellation >= 2 { 2.0 } else { 1.0 };
attribute.add_edge1(
AttributeName::ATK,
AttributeName::ExtraDmgPlungingAttack3,
AttributeName::ExtraDmgPlungingAttackLowHigh,
Box::new(move |atk, _| (9000.0_f64 * factor).min(atk * 2.0 * rate * factor)),
Box::new(|_x, _y, _z| (0.0, 0.0)),
"天赋「细想应是洞中仙」"
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/anemo/xiao.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,8 @@ impl XiaoDamageEnum {
use XiaoDamageEnum::*;
match *self {
Charged => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 => SkillType::ElementalSkill,
_ => SkillType::NormalAttack
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/cryo/aloy.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,8 @@ impl AloyDamageEnum {
match *self {
Normal11 | Normal12 | Normal2 | Normal3 | Normal4 => SkillType::NormalAttack,
Charged1 | Charged2 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 | E2 => SkillType::ElementalSkill,
Q1 => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/cryo/charlotte.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,8 @@ impl CharlotteDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 => SkillType::NormalAttack,
Charged => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 | E2 | E3 | E4 => SkillType::ElementalSkill,
QHeal1 | QHeal2 | Q1 | Q2 => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/cryo/diona.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,8 @@ impl DionaDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 | Normal4 | Normal5 => SkillType::NormalAttack,
Charged1 | Charged2 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 => SkillType::ElementalSkill,
Q1 | Q2 | QHeal => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/cryo/eula.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,8 @@ impl EulaDamageEnum {
use EulaDamageEnum::*;
match *self {
Charged1 | Charged2 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 | E2 | E3 => SkillType::ElementalSkill,
Q1 | QLightfall | EShatteredLightfall => SkillType::ElementalBurst,
_ => SkillType::NormalAttack
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/cryo/freminet.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@ impl FreminetDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 | Normal4 => SkillType::NormalAttack,
Charged1 | Charged2 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 | E2 | EShatter0 | EShatter1Cryo | EShatter1Physical | EShatter2Cryo | EShatter2Physical
| EShatter3Cryo | EShatter3Physical | EShatter4 | E2Mul2 | E3 => SkillType::ElementalSkill,
Q1 => SkillType::ElementalBurst,
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/cryo/ganyu.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,8 @@ impl GanyuDamageEnum {

match *self {
Charged1 | Charged2 | Charged3 | Charged4 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 => SkillType::ElementalSkill,
Q1 => SkillType::ElementalBurst,
_ => SkillType::NormalAttack
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/cryo/kaeya.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,8 @@ impl KaeyaDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 | Normal4 | Normal5 => SkillType::NormalAttack,
Charged11 | Charged12 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 => SkillType::ElementalSkill,
Q1 => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/cryo/kamisato_ayaka.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,8 @@ impl KamisatoAyakaDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 | Normal4 | Normal4Times3 | Normal5 => SkillType::NormalAttack,
Charged | ChargedTimes3 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 => SkillType::ElementalSkill,
Q1 | Q2 => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/cryo/layla.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,8 @@ impl LaylaDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 => SkillType::NormalAttack,
Charged11 | Charged12 => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 | E2 => SkillType::ElementalSkill,
Q1 => SkillType::ElementalBurst
}
Expand Down
5 changes: 2 additions & 3 deletions mona_core/src/character/characters/cryo/mika.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,8 @@ impl MikaDamageEnum {
match *self {
Normal1 | Normal2 | Normal3 | Normal4 | Normal5 => SkillType::NormalAttack,
Charged => SkillType::ChargedAttack,
Plunging1 => SkillType::PlungingAttackLow,
Plunging2 => SkillType::PlungingAttackHigh,
Plunging3 => SkillType::PlungingAttackGround,
Plunging1 => SkillType::PlungingAttackInAction,
Plunging2 | Plunging3 => SkillType::PlungingAttackOnGround,
E1 | E2 | E3 => SkillType::ElementalSkill,
QHeal1 | QHeal2 => SkillType::ElementalBurst,
}
Expand Down
Loading

0 comments on commit a3faefd

Please sign in to comment.