Skip to content

Commit 86ac671

Browse files
committed
Adjust frames
1 parent 277d71e commit 86ac671

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

internal/characters/skirk/attack.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/genshinsim/gcsim/pkg/core/attributes"
1010
"github.com/genshinsim/gcsim/pkg/core/combat"
1111
"github.com/genshinsim/gcsim/pkg/core/geometry"
12+
"github.com/genshinsim/gcsim/pkg/core/glog"
1213
)
1314

1415
const windup = 2
@@ -24,7 +25,7 @@ var (
2425
attackOffsets = [][]float64{{-0.1}, {-0.1}, {1.5, 1.5}, {1.1}, {-0.1}}
2526

2627
attackSkillFrames [][]int
27-
attackSkillHitmarks = [][]int{{11 + windup}, {11}, {11, 11 + 12}, {11, 11 + 16}, {25}}
28+
attackSkillHitmarks = [][]int{{10 + windup}, {11}, {11, 11 + 12}, {11, 11 + 16}, {25}}
2829
attackSkillHitlagHaltFrame = [][]float64{{0.02}, {0.03}, {0.03, 0.00}, {0.03, 0.00}, {0.06}}
2930
attackSkillHitlagFactor = [][]float64{{0.01}, {0.01}, {0.01, 0.00}, {0.01, 0.00}, {0.01}}
3031
attackSkillHitboxes = [][][]float64{{{7, 2.4}}, {{7, 3}}, {{6, 3.6}, {6, 3.6}}, {{5, 3.6}, {5, 3.6}}, {{11, 3.6}}}
@@ -131,6 +132,7 @@ func (c *char) Attack(p map[string]int) (action.Info, error) {
131132

132133
c.prevNASkillState = false
133134
normalCounter := c.NormalCounter
135+
134136
defer c.AdvanceNormalIndex()
135137

136138
return action.Info{
@@ -188,7 +190,15 @@ func (c *char) AttackSkill(p map[string]int) (action.Info, error) {
188190
c.prevNASkillState = true
189191
normalCounter := c.NormalCounter
190192
defer c.AdvanceNormalIndex()
193+
str := ""
194+
for i := range 5 {
191195

196+
for _, atkspd := range []float64{0.0, .06, 0.08, .10, .12, .15, .16, .18, .20, .25, .28, .30, .35, .38, .40, .45, .50, .55, .60} {
197+
str += fmt.Sprint(frames.AtkSpdAdjust(attackSkillFrames[i][action.ActionAttack], atkspd), "\t")
198+
}
199+
str += "\n"
200+
}
201+
c.Core.Log.NewEventBuildMsg(glog.LogCharacterEvent, c.Index, str)
192202
return action.Info{
193203
Frames: func(next action.Action) int {
194204
return frames.AtkSpdAdjust(attackSkillFrames[normalCounter][next], c.Stat(attributes.AtkSpd)) - windupRemove

0 commit comments

Comments
 (0)