Skip to content

Commit

Permalink
Add Yelan aim cancels (#587)
Browse files Browse the repository at this point in the history
...and actually set the frames to be used
  • Loading branch information
kurt22i authored Jun 12, 2022
1 parent 4fbee11 commit e84f711
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
12 changes: 8 additions & 4 deletions internal/characters/yelan/frames.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ func (c *char) ActionFrames(a core.ActionType, p map[string]int) (int, int) {
return f, a
case core.ActionAim:
if c.Core.Status.Duration("breakthrough") > 0 { //Reduce required by 80% time if she has breakthrough
reduced_frames := 34
return int(reduced_frames), int(reduced_frames)
return 32, 42
}
return 74, 74 //kqm
return 86, 96
case core.ActionBurst:
return 76, 93
case core.ActionSkill:
Expand Down Expand Up @@ -58,7 +57,12 @@ func (c *char) InitCancelFrames() {
c.SetNormalCancelFrames(3, core.ActionAttack, 67-29) //n4 -> next attack (n1)
//c.SetNormalCancelFrames(3, core.Actionaim, 33-17) //n4 -> aim

//todo: aim cancels
//todo: confirm that aim->x is the same for all cancels
c.SetAbilCancelFrames(core.ActionAim, core.ActionAttack, 96-86) //aim -> n1
c.SetAbilCancelFrames(core.ActionAim, core.ActionAim, 96-86) //aim -> aim
c.SetAbilCancelFrames(core.ActionAim, core.ActionSkill, 96-86) //aim -> skill
c.SetAbilCancelFrames(core.ActionAim, core.ActionBurst, 96-86) //aim -> burst
c.SetAbilCancelFrames(core.ActionAim, core.ActionSwap, 96-86) //aim -> swap

c.SetAbilCancelFrames(core.ActionBurst, core.ActionAttack, 92-76) //burst -> n1
c.SetAbilCancelFrames(core.ActionBurst, core.ActionAim, 92-76) //burst -> aim (assumed)
Expand Down
1 change: 1 addition & 0 deletions internal/characters/yelan/yelan.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ func (c *char) Init() {
c.c2icd = 0
c.c6count = 0
c.a1()
c.InitCancelFrames()

}

Expand Down

0 comments on commit e84f711

Please sign in to comment.