fix c1 & add c4

kengzzzz · Jul 7, 2024 · 4d6e477 · 4d6e477
1 parent a7284aa
commit 4d6e477
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/internal/characters/emilie/burst.go b/internal/characters/emilie/burst.go
@@ -14,10 +14,11 @@ var (
 )
 
 const (
-	burstHitmark  = 104
-	burstDuration = 168
-	burstInterval = 18
-	burstMarkKey  = "emilie-burst-mark"
+	burstHitmark   = 104
+	burstDuration  = 168
+	burstInterval  = 18
+	burstTargetICD = 42
+	burstMarkKey   = "emilie-burst-mark"
 )
 
 func init() {
@@ -51,7 +52,7 @@ func (c *char) Burst(_ map[string]int) (action.Info, error) {
 			c.removeLumi(c.lumidouceSrc)()
 		}
 
-		for i := 21; i <= burstDuration; i += burstInterval {
+		for i := 21; i <= burstDuration+c.c4Dur(); i += burstInterval {
 			enemy := c.Core.Combat.RandomEnemyWithinArea(
 				burstArea,
 				func(e combat.Enemy) bool {
@@ -61,7 +62,7 @@ func (c *char) Burst(_ map[string]int) (action.Info, error) {
 			var pos geometry.Point
 			if enemy != nil {
 				pos = enemy.Pos()
-				enemy.AddStatus(burstMarkKey, 0.7*60, false)
+				enemy.AddStatus(burstMarkKey, burstTargetICD+c.c4Interval(), false)
 			} else {
 				pos = geometry.CalcRandomPointFromCenter(burstArea.Shape.Pos(), 0.5, 12.5, c.Core.Rand)
 			}
@@ -74,7 +75,7 @@ func (c *char) Burst(_ map[string]int) (action.Info, error) {
 				0,
 			)
 		}
-	}, 21)
+	}, 17)
 
 	c.QueueCharTask(func() {
 		c.lumidouceLvl = oldLvl
@@ -85,7 +86,7 @@ func (c *char) Burst(_ map[string]int) (action.Info, error) {
 
 		c.Core.Tasks.Add(c.lumiTick(c.Core.F), skillLumiFirstTick)
 		c.Core.Tasks.Add(c.removeLumi(c.Core.F), 22*60)
-	}, burstDuration)
+	}, burstDuration+c.c4Dur())
 
 	c.ConsumeEnergy(12)
 	c.SetCD(action.ActionBurst, 13.5*60)

diff --git a/internal/characters/emilie/cons.go b/internal/characters/emilie/cons.go
@@ -46,7 +46,8 @@ func (c *char) c1() {
 		c.AddStatus(c1ICDKey, c1ICDDur, false)
 		if c.lumidouceLvl < 4 {
 			c.lumidouceLvl++
-		} else if c.lumidouceLvl == 4 {
+		}
+		if c.lumidouceLvl == 4 {
 			c.lumidouceLvl = 2
 			c.Core.Events.Emit(event.OnEmilieA1)
 		}
@@ -71,7 +72,8 @@ func (c *char) c1() {
 		c.AddStatus(c1ICDKey, c1ICDDur, false)
 		if c.lumidouceLvl < 4 {
 			c.lumidouceLvl++
-		} else if c.lumidouceLvl == 4 {
+		}
+		if c.lumidouceLvl == 4 {
 			c.lumidouceLvl = 2
 			c.Core.Events.Emit(event.OnEmilieA1)
 		}
@@ -102,3 +104,19 @@ func (c *char) c2() {
 		return false
 	}, "emilie-c2")
 }
+
+func (c *char) c4Dur() int {
+	if c.Base.Cons < 4 {
+		return 0
+	}
+
+	return 120
+}
+
+func (c *char) c4Interval() int {
+	if c.Base.Cons < 4 {
+		return 0
+	}
+
+	return -0.3 * 60
+}