Skip to content

Commit

Permalink
Fix raiden skill timing and self dmg check (genshinsim#2271)
Browse files Browse the repository at this point in the history
  • Loading branch information
shizukayuki authored Nov 16, 2024
1 parent 328b641 commit 7ee5741
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions internal/characters/raiden/skill.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (c *char) Skill(p map[string]int) (action.Info, error) {
m := make([]float64, attributes.EndStatType)
for _, char := range c.Core.Player.Chars() {
this := char
// start eye at hitmark only, eye dmg shouldn't be able to proc before the eye spawns
// starts 1s after cd delay
c.Core.Tasks.Add(func() {
this.AddAttackMod(character.AttackMod{
Base: modifier.NewBaseWithHitlag(skillKey, 1500),
Expand All @@ -69,7 +69,7 @@ func (c *char) Skill(p map[string]int) (action.Info, error) {
return m, true
},
})
}, skillHitmark)
}, 6+60)
}

c.SetCDWithDelay(action.ActionSkill, 600, 6)
Expand Down Expand Up @@ -121,7 +121,9 @@ func (c *char) eyeOnDamage() {
return false
}
// ignore self dmg
if ae.Info.Abil == "Eye of Stormy Judgement" {
if ae.Info.ActorIndex == c.Index &&
ae.Info.AttackTag == attacks.AttackTagElementalArt &&
ae.Info.StrikeType == attacks.StrikeTypeSlash {
return false
}
// ignore 0 damage
Expand Down

0 comments on commit 7ee5741

Please sign in to comment.