fix lyney c1 stack timing

- the extra prop stack is granted at hitmark and regardless of HP drain
soloxcx · Jan 17, 2025 · 9ee7f74 · 9ee7f74
1 parent 753f2cf
commit 9ee7f74
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/internal/characters/lyney/aimed.go b/internal/characters/lyney/aimed.go
@@ -164,6 +164,7 @@ func (c *char) PropAimed(p map[string]int) (action.Info, error) {
 		// https://youtu.be/QblKD2-9WNE?si=xcd4NAl2Wq-46fQI
 		hpDrained := c.propSurplus()
 
+		c.QueueCharTask(c.addC1PropStack(), travel)
 		c.QueueCharTask(c.makeGrinMalkinHat(target.Pos(), hpDrained), travel)
 		c.QueueCharTask(c.skillAligned(target.Pos()), travel)
 	}, aimedPropRelease)
@@ -201,7 +202,7 @@ func (c *char) propSurplus() bool {
 		Amount:     hpdrain,
 	})
 
-	c.increasePropSurplusStacks(1 + c.c1StackIncrease())
+	c.increasePropSurplusStacks(1)
 	return true
 }
 

diff --git a/internal/characters/lyney/cons.go b/internal/characters/lyney/cons.go
@@ -26,12 +26,14 @@ func (c *char) c1() {
 	c.maxHatCount = 2
 }
 
-func (c *char) c1StackIncrease() int {
-	addCount := 0
-	if c.Base.Cons >= 1 && !c.StatusIsActive(c1ICDKey) {
-		addCount = 1
+// C1 Prop stack is granted regardless of HP drain
+func (c *char) addC1PropStack() func() {
+	return func() {
+		if c.Base.Cons < 1 || c.StatusIsActive(c1ICDKey) {
+			return
+		}
+		c.increasePropSurplusStacks(1)
 	}
-	return addCount
 }
 
 func (c *char) c1HatIncrease() int {