From 7a3f403c03b87e05ba89fbefbf7372c057a2efab Mon Sep 17 00:00:00 2001
From: soloxcx <58927267+soloxcx@users.noreply.github.com>
Date: Fri, 24 Jan 2025 16:01:16 -0600
Subject: [PATCH] fix lyney c1 stack timing (#2311)

* fix lyney c1 stack timing
- the extra prop stack is granted at hitmark and regardless of HP drain

* lyney prop stack function doesnt need param anymore
---
 internal/characters/lyney/aimed.go |  7 ++++---
 internal/characters/lyney/burst.go |  2 +-
 internal/characters/lyney/cons.go  | 12 +++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/internal/characters/lyney/aimed.go b/internal/characters/lyney/aimed.go
index cea71a7e7..ef89b62a7 100644
--- 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,12 +202,12 @@ func (c *char) propSurplus() bool {
 		Amount:     hpdrain,
 	})
 
-	c.increasePropSurplusStacks(1 + c.c1StackIncrease())
+	c.increasePropSurplusStacks()
 	return true
 }
 
-func (c *char) increasePropSurplusStacks(increase int) {
-	c.propSurplusStacks += increase
+func (c *char) increasePropSurplusStacks() {
+	c.propSurplusStacks++
 	if c.propSurplusStacks > 5 {
 		c.propSurplusStacks = 5
 	}
diff --git a/internal/characters/lyney/burst.go b/internal/characters/lyney/burst.go
index cc8816ff3..359eb06ed 100644
--- a/internal/characters/lyney/burst.go
+++ b/internal/characters/lyney/burst.go
@@ -117,5 +117,5 @@ func (c *char) explosiveFirework() {
 	c.hats = append(c.hats, g)
 	c.Core.Combat.AddGadget(g)
 
-	c.increasePropSurplusStacks(1)
+	c.increasePropSurplusStacks()
 }
diff --git a/internal/characters/lyney/cons.go b/internal/characters/lyney/cons.go
index 08f49f371..02a7f7244 100644
--- 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()
 	}
-	return addCount
 }
 
 func (c *char) c1HatIncrease() int {