Skip to content

Commit

Permalink
fix lyney c1 stack timing (#2311)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
soloxcx authored Jan 24, 2025
1 parent 36754f4 commit 7a3f403
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
7 changes: 4 additions & 3 deletions internal/characters/lyney/aimed.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion internal/characters/lyney/burst.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,5 @@ func (c *char) explosiveFirework() {
c.hats = append(c.hats, g)
c.Core.Combat.AddGadget(g)

c.increasePropSurplusStacks(1)
c.increasePropSurplusStacks()
}
12 changes: 7 additions & 5 deletions internal/characters/lyney/cons.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 7a3f403

Please sign in to comment.