Fix klee A1 and CA snapshot

internal/characters/klee/asc.go

@@ -2,28 +2,32 @@ package klee
 
 import (
 	"github.com/genshinsim/gcsim/pkg/core/combat"
-	"github.com/genshinsim/gcsim/pkg/core/glog"
 	"github.com/genshinsim/gcsim/pkg/core/targets"
 )
 
+const (
+	a1IcdKey   = "a1-icd"
+	a1SparkKey = "a1-spark"
+)
+
 // When Jumpy Dumpty and Normal Attacks deal DMG, Klee has a 50% chance to obtain an Explosive Spark.
 // This Explosive Spark is consumed by the next Charged Attack, which costs no Stamina and deals 50% increased DMG.
 func (c *char) makeA1CB() combat.AttackCBFunc {
 	if c.Base.Ascension < 1 {
 		return nil
 	}
 	return func(a combat.AttackCB) {
-		if c.Core.F < c.sparkICD {
+		if c.StatusIsActive(a1IcdKey) {
 			return
 		}
 		if c.Core.Rand.Float64() < 0.5 {
 			return
 		}
+		c.AddStatus(a1IcdKey, 60*5, true)
 
-		c.sparkICD = c.Core.F + 60*4
-		c.Core.Status.Add("kleespark", 60*30)
-		c.Core.Log.NewEvent("klee gained spark", glog.LogCharacterEvent, c.Index).
-			Write("icd", c.sparkICD)
+		if !c.StatusIsActive(a1SparkKey) {
+			c.AddStatus(a1SparkKey, 60*30, true)
+		}
 	}
 }
 

internal/characters/klee/charge.go

@@ -6,13 +6,13 @@ import (
 	"github.com/genshinsim/gcsim/pkg/core/attacks"
 	"github.com/genshinsim/gcsim/pkg/core/attributes"
 	"github.com/genshinsim/gcsim/pkg/core/combat"
-	"github.com/genshinsim/gcsim/pkg/core/glog"
 )
 
 var chargeFrames []int
 
 const (
-	chargeHitmark = 76
+	chargeHitmark  = 76
+	chargeSnapshot = 29 + 32
 )
 
 func init() {
@@ -44,28 +44,33 @@ func (c *char) ChargeAttack(p map[string]int) (action.Info, error) {
 		Durability: 25,
 		Mult:       charge[c.TalentLvlAttack()],
 	}
-	// stam is calculated before this func is called so it's safe to
-	// set spark to 0 here
-	snap := c.Snapshot(&ai)
-	if c.Core.Status.Duration("kleespark") > 0 {
-		snap.Stats[attributes.DmgP] += .50
-		c.Core.Status.Delete("kleespark")
-		c.Core.Log.NewEvent("klee consumed spark", glog.LogCharacterEvent, c.Index).
-			Write("icd", c.sparkICD)
-	}
 
 	windup := 0
-	if (c.Core.Player.CurrentState() == action.NormalAttackState && (c.NormalCounter == 1 || c.NormalCounter == 2)) ||
-		c.Core.Player.CurrentState() == action.SkillState {
+	switch c.Core.Player.CurrentState() {
+	case action.NormalAttackState:
+		if c.NormalCounter == 1 || c.NormalCounter == 2 {
+			windup = 14
+		}
+	case action.SkillState:
 		windup = 14
 	}
-	c.Core.QueueAttackWithSnap(
-		ai,
-		snap,
-		combat.NewCircleHit(c.Core.Combat.Player(), c.Core.Combat.PrimaryTarget(), nil, 3),
-		chargeHitmark-windup+travel,
-		c.makeA4CB(),
-	)
+
+	c.Core.Tasks.Add(func() {
+		// apply and clear spark
+		snap := c.Snapshot(&ai)
+		if c.StatusIsActive(a1SparkKey) {
+			snap.Stats[attributes.DmgP] += .50
+			c.DeleteStatus(a1SparkKey)
+		}
+
+		c.Core.QueueAttackWithSnap(
+			ai,
+			snap,
+			combat.NewCircleHit(c.Core.Combat.Player(), c.Core.Combat.PrimaryTarget(), nil, 3),
+			(chargeHitmark-chargeSnapshot)+travel,
+			c.makeA4CB(),
+		)
+	}, chargeSnapshot-windup)
 
 	c.c1(chargeHitmark - windup + travel)
 

internal/characters/klee/klee.go

@@ -16,7 +16,6 @@ func init() {
 type char struct {
 	*tmpl.Character
 	c1Chance float64
-	sparkICD int
 }
 
 func NewChar(s *core.Core, w *character.CharWrapper, _ info.CharacterProfile) error {
@@ -28,8 +27,6 @@ func NewChar(s *core.Core, w *character.CharWrapper, _ info.CharacterProfile) er
 	c.SkillCon = 3
 	c.BurstCon = 5
 
-	c.sparkICD = -1
-
 	c.SetNumCharges(action.ActionSkill, 2)
 
 	w.Character = &c
@@ -44,7 +41,7 @@ func (c *char) Init() error {
 
 func (c *char) ActionStam(a action.Action, p map[string]int) float64 {
 	if a == action.ActionCharge {
-		if c.Core.Status.Duration("kleespark") > 0 {
+		if c.StatusIsActive(a1SparkKey) {
 			return 0
 		}
 		return 50