Adjusted lauma pale hymn usage priority to be c6, then moonsong, then burst.

Author: Charlie-Zheng

go.mod

@@ -60,7 +60,6 @@ require (
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/fatih/color v1.15.0 // indirect
-	github.com/gammazero/deque v1.2.0 // indirect
 	github.com/go-fed/httpsig v1.1.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect

go.sum

@@ -87,8 +87,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
 github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gammazero/deque v1.2.0 h1:scEFO8Uidhw6KDU5qg1HA5fYwM0+us2qdeJqm43bitU=
-github.com/gammazero/deque v1.2.0/go.mod h1:JVrR+Bj1NMQbPnYclvDlvSX0nVGReLrQZ0aUMuWLctg=
 github.com/go-chi/chi v1.5.5 h1:vOB/HbEMt9QqBqErz07QehcOKHaWFtuj87tTDVz2qXE=
 github.com/go-chi/chi v1.5.5/go.mod h1:C9JqLr3tIYjDOZpzn+BCuxY8z8vmca43EeMgyZt7irw=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=

internal/characters/lauma/burst.go

@@ -15,6 +15,16 @@ var burstFrames []int
 
 const paleHymnDur = 15 * 60
 
+const (
+	paleHymnC6       = 0
+	paleHymnMoonsong = 1
+	paleHymnBurst    = 2
+
+	paleHymnC6Key       = "lauma-pale-hymn-c6"
+	paleHymnMoonsongKey = "lauma-pale-hymn-moonsong"
+	paleHymnBurstKey    = "lauma-pale-hymn-burst"
+)
+
 func init() {
 	burstFrames = frames.InitAbilSlice(115) // Q -> walk
 	burstFrames[action.ActionAttack] = 111
@@ -36,7 +46,7 @@ func (c *char) Burst(p map[string]int) (action.Info, error) {
 	c.DeleteStatus(moonSongIcdKey)
 	c.Core.Tasks.Add(func() {
 		c.c1OnBurst()
-		c.addPaleHymn(18)
+		c.addPaleHymnBurst(18)
 
 		c.AddStatus(burstKey, paleHymnDur, true) // should this be here?
 		c.moonSongOnBurst()
@@ -95,66 +105,59 @@ func (c *char) initBurst() {
 }
 
 func (c *char) paleHymnCount() int {
-	c.removeExpiredPaleHymn()
-	return c.paleHymnStacksSrc.Len() + c.paleHymnStacksSrcC6.Len()
+	return c.paleHymn[paleHymnBurst] + c.paleHymn[paleHymnMoonsong] + c.paleHymn[paleHymnC6]
 }
 
-func (c *char) addPaleHymn(amount int) {
-	startFrame := c.TimePassed
+func (c *char) addPaleHymnBurst(amount int) {
+	ind := paleHymnBurst
+	c.paleHymn[ind] += amount
+	c.paleHymnSrc[ind] = c.Core.F
+	c.AddStatus(paleHymnBurstKey, paleHymnDur, true)
+	c.QueueCharTask(c.removeExpiredPaleHymn(c.paleHymnSrc[ind], ind), paleHymnDur)
+}
 
-	for range amount {
-		c.paleHymnStacksSrc.PushBack(startFrame)
-	}
-	c.QueueCharTask(c.removeExpiredPaleHymn, paleHymnDur+1)
+func (c *char) addPaleHymnMoonsong(amount int) {
+	ind := paleHymnMoonsong
+	c.paleHymn[ind] += amount
+	c.paleHymnSrc[ind] = c.Core.F
+	c.AddStatus(paleHymnMoonsongKey, paleHymnDur, true)
+	c.QueueCharTask(c.removeExpiredPaleHymn(c.paleHymnSrc[ind], ind), paleHymnDur)
 }
 
 func (c *char) addC6PaleHymn(amount int) {
-	startFrame := c.TimePassed
-	for range amount {
-		c.paleHymnStacksSrcC6.PushBack(startFrame)
-	}
-	c.c6PaleHymnExpiry = c.TimePassed + paleHymnDur
-	c.QueueCharTask(c.removeExpiredPaleHymn, paleHymnDur+1)
+	ind := paleHymnC6
+	c.paleHymn[ind] += amount
+	c.paleHymnSrc[ind] = c.Core.F
+	c.AddStatus(paleHymnC6Key, paleHymnDur, true)
+	c.QueueCharTask(c.removeExpiredPaleHymn(c.paleHymnSrc[ind], ind), paleHymnDur)
 }
 
 // attempts to consume a pale hymn.
 func (c *char) consumePaleHymn() {
-	c.removeExpiredPaleHymn()
-	if c.paleHymnStacksSrc.Len() == 0 && c.paleHymnStacksSrcC6.Len() == 0 {
-		// error?
-		// panic("consumePaleHymn() called on without Pale Hymn stacks")
+	if c.paleHymn[paleHymnC6] > 0 {
+		c.paleHymn[paleHymnC6]--
 		return
 	}
 
-	if c.paleHymnStacksSrc.Len() == 0 {
-		c.paleHymnStacksSrcC6.PopFront()
+	if c.paleHymn[paleHymnMoonsong] > 0 {
+		c.paleHymn[paleHymnMoonsong]--
 		return
 	}
 
-	if c.paleHymnStacksSrcC6.Len() == 0 {
-		c.paleHymnStacksSrc.PopFront()
+	if c.paleHymn[paleHymnBurst] > 0 {
+		c.paleHymn[paleHymnBurst]--
 		return
 	}
 
-	// pop whichever one is closer to expiry
-	paleHymnSrc := c.paleHymnStacksSrc.Front()
-	paleHymnSrcC6 := c.paleHymnStacksSrcC6.Front()
-
-	if paleHymnSrc < paleHymnSrcC6 {
-		c.paleHymnStacksSrc.PopFront()
-	} else {
-		c.paleHymnStacksSrcC6.PopFront()
-	}
+	// err or panic?
+	// panic("consumePaleHymn called when there are no pale hymn stacks")
 }
 
-func (c *char) removeExpiredPaleHymn() {
-	currentFrame := c.TimePassed
-
-	for c.paleHymnStacksSrc.Len() > 0 && c.paleHymnStacksSrc.Front()+paleHymnDur < currentFrame {
-		c.paleHymnStacksSrc.PopFront()
-	}
-
-	if c.c6PaleHymnExpiry < currentFrame {
-		c.paleHymnStacksSrcC6.Clear()
+func (c *char) removeExpiredPaleHymn(src, index int) func() {
+	return func() {
+		if c.paleHymnSrc[index] != src {
+			return
+		}
+		c.paleHymn[index] = 0
 	}
 }

internal/characters/lauma/cons.go

@@ -146,9 +146,10 @@ func (c *char) c6OnSkill() {
 	if c.Base.Cons < 6 {
 		return
 	}
-	// TODO: Does this clear immediately on skill use?
-	c.c6PaleHymnExpiry = -1
-	c.paleHymnStacksSrcC6.Clear()
+	// TODO: Does clearing on skill use have a delay?
+	c.DeleteStatus(paleHymnC6Key)
+	c.paleHymn[paleHymnC6] = 0
+	c.paleHymnSrc[paleHymnC6] = 0
 	c.c6Count = 0
 }
 
@@ -184,8 +185,8 @@ func (c *char) c6OnFrostgroveTick() {
 			nil,
 			6,
 		),
-		0,
-		0,
+		16, // 0.26s delay from DM
+		16,
 		c.addC6PaleHymnCB,
 	)
 }

internal/characters/lauma/lauma.go

@@ -1,8 +1,6 @@
 package lauma
 
 import (
-	"github.com/gammazero/deque"
-
 	tmpl "github.com/genshinsim/gcsim/internal/template/character"
 	"github.com/genshinsim/gcsim/pkg/core"
 	"github.com/genshinsim/gcsim/pkg/core/action"
@@ -17,15 +15,15 @@ func init() {
 
 type char struct {
 	*tmpl.Character
-	ascendantGleam      bool
-	deerStateReady      bool
-	skillSrc            int
-	moonSong            int
-	moonSongSrc         int
-	c6Count             int
-	paleHymnStacksSrc   deque.Deque[int]
-	paleHymnStacksSrcC6 deque.Deque[int]
-	c6PaleHymnExpiry    int
+	ascendantGleam bool
+	deerStateReady bool
+	skillSrc       int
+	moonSong       int
+	moonSongSrc    int
+	c6Count        int
+
+	paleHymn    [3]int
+	paleHymnSrc [3]int
 }
 
 func NewChar(s *core.Core, w *character.CharWrapper, _ info.CharacterProfile) error {

internal/characters/lauma/skill.go

@@ -185,7 +185,7 @@ func (c *char) addMoonSong(moonsong int) {
 	}
 
 	if c.StatusIsActive(burstKey) && !c.StatusIsActive(moonSongIcdKey) {
-		c.addPaleHymn(moonsong * 6)
+		c.addPaleHymnMoonsong(moonsong * 6)
 		c.AddStatus(moonSongIcdKey, c.StatusDuration(burstKey), true)
 		c.moonSong = 0
 		c.moonSongSrc = -1
@@ -217,7 +217,7 @@ func (c *char) moonSongOnBurst() {
 		return
 	}
 
-	c.addPaleHymn(c.moonSong * 6)
+	c.addPaleHymnMoonsong(c.moonSong * 6)
 	c.AddStatus(moonSongIcdKey, c.StatusDuration(burstKey), true)
 	c.moonSong = 0
 	c.moonSongSrc = -1