Adjust clorinde timing for heal, C6 hitmark, ICD hitlag and stack loss (#2321)

Author: shizukayuki

internal/characters/clorinde/cons.go

@@ -144,13 +144,14 @@ func (c *char) c6skill() {
 // will appear under specific circumstances, executing an attack
 // that deals 200% of Clorinde's ATK as Electro DMG.
 // DMG dealt this way is considered Normal Attack DMG.
-
 func (c *char) c6() {
 	if c.StatusIsActive(c6GlimbrightIcdKey) {
 		return
 	}
 
-	c.AddStatus(c6GlimbrightIcdKey, 1*60, false)
+	c.c6Stacks--
+	c.AddStatus(c6GlimbrightIcdKey, 1*60, true)
+
 	c6AI := combat.AttackInfo{
 		ActorIndex:     c.Index,
 		Abil:           "Glimbright Shade (C6)",
@@ -163,10 +164,5 @@ func (c *char) c6() {
 		Mult:           c6GlimbrightAtkP,
 		IgnoreInfusion: true,
 	}
-	c.Core.QueueAttack(
-		c6AI,
-		combat.NewCircleHitOnTarget(c.Core.Combat.PrimaryTarget(), nil, 8),
-		1, //TODO: c6 hitmark
-		1,
-	)
+	c.Core.QueueAttack(c6AI, combat.NewCircleHitOnTarget(c.Core.Combat.PrimaryTarget(), nil, 8), 0, 0)
 }

internal/characters/clorinde/skill.go

@@ -22,6 +22,7 @@ const (
 	particleICDKey = "clorinde-particle-icd"
 
 	skillDashHitmark = 11
+	skillHealFrame   = 6 // no ping
 	tolerance        = 0.0000001
 	skillStart       = 6
 	skillCD          = 16 * 60
@@ -70,10 +71,6 @@ func (c *char) skillDash(p map[string]int) (action.Info, error) {
 	ratio := c.currentHPDebtRatio()
 	switch {
 	case ratio >= 1:
-		if c.Base.Cons >= 6 && c.c6Stacks > 0 {
-			c.c6()
-			c.c6Stacks -= 1
-		}
 		return c.skillDashFullBOL(p)
 	case math.Abs(ratio) < tolerance:
 		return c.skillDashNoBOL(p)
@@ -132,10 +129,17 @@ func (c *char) skillDashFullBOL(_ map[string]int) (action.Info, error) {
 		c.Core.QueueAttack(ai, ap, skillDashHitmark, skillDashHitmark, c.particleCB)
 	}
 
-	// Bond of Life timing is ping dependent
 	c.QueueCharTask(func() {
 		c.skillHeal(skillLungeFullBOLHeal[0], "Impale the Night (100%+ BoL)")
-	}, skillDashHitmark)
+	}, skillHealFrame)
+
+	if c.Base.Cons >= 6 && c.c6Stacks > 0 {
+		c.QueueCharTask(func() {
+			if c.StatusIsActive(skillStateKey) {
+				c.c6()
+			}
+		}, 37)
+	}
 
 	return action.Info{
 		Frames:          frames.NewAbilFunc(skillDashFrames),
@@ -163,10 +167,9 @@ func (c *char) skillDashRegular(_ map[string]int) (action.Info, error) {
 	ap := combat.NewCircleHitOnTarget(c.Core.Combat.PrimaryTarget(), nil, 0.8)
 	c.Core.QueueAttack(ai, ap, skillDashHitmark, skillDashHitmark, c.particleCB)
 
-	// Bond of Life timing is ping dependent
 	c.QueueCharTask(func() {
 		c.skillHeal(skillLungeLowBOLHeal[0], "Impale the Night (<100% BoL)")
-	}, skillDashHitmark)
+	}, skillHealFrame)
 
 	return action.Info{
 		Frames:          frames.NewAbilFunc(skillDashFrames),