Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix raiden skill timing and self dmg check #2271

Merged
merged 1 commit into from
Nov 16, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading