Merge pull request #715 from k0l11/eula-bugfix

eula & pale flame bug fixes

Author: shizukayuki

internal/artifacts/paleflame/paleflame.go

@@ -7,6 +7,7 @@ import (
 	"github.com/genshinsim/gcsim/pkg/core/attributes"
 	"github.com/genshinsim/gcsim/pkg/core/combat"
 	"github.com/genshinsim/gcsim/pkg/core/event"
+	"github.com/genshinsim/gcsim/pkg/core/glog"
 	"github.com/genshinsim/gcsim/pkg/core/keys"
 	"github.com/genshinsim/gcsim/pkg/core/player/artifact"
 	"github.com/genshinsim/gcsim/pkg/core/player/character"
@@ -19,7 +20,6 @@ func init() {
 
 type Set struct {
 	stacks int
-	icd    int
 	buff   []float64
 	Index  int
 }
@@ -35,7 +35,7 @@ func (s *Set) updateBuff() {
 	s.buff[attributes.ATKP] = 0.09 * float64(s.stacks)
 }
 
-const pf4key = "paleflame-4pc"
+const pf4key = "pf-4pc"
 
 func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[string]int) (artifact.Set, error) {
 	s := Set{}
@@ -77,9 +77,12 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
 			}
 			s.updateBuff()
 
+			c.Log.NewEvent("paleflame gained stack", glog.LogArtifactEvent, char.Index).
+				Write("stacks", s.stacks)
+
 			char.AddStatus(icdKey, icd, true)
 			char.AddStatMod(character.StatMod{
-				Base:         modifier.NewBaseWithHitlag("pf-4pc", 420),
+				Base:         modifier.NewBaseWithHitlag(pf4key, 420),
 				AffectedStat: attributes.NoStat,
 				Amount: func() ([]float64, bool) {
 					return s.buff, true

internal/characters/eula/burst.go

@@ -58,22 +58,24 @@ func (c *char) Burst(p map[string]int) action.ActionInfo {
 	c.ResetActionCooldown(action.ActionSkill)
 	c.Core.Log.NewEvent("eula a4 reset skill cd", glog.LogCharacterEvent, c.Index)
 
-	// lights up 9.5s from cast
-	//deployable; not affected by hitlag
+	// handle Eula Q status start
+	// lightfall sword lights up ~9.5s from cast
+	// deployable; not affected by hitlag
 	c.Core.Tasks.Add(func() {
-		c.Core.Status.Add(burstKey, 9*60)
+		c.Core.Status.Add(burstKey, 600-lightfallHitmark-burstFrames[action.ActionWalk]+1)
 		c.Core.Log.NewEvent("eula burst started", glog.LogCharacterEvent, c.Index).
 			Write("stacks", c.burstCounter).
-			Write("expiry", c.Core.Status.Duration(burstKey))
-	}, burstFrames[action.ActionWait]) // start at earliest point
+			Write("expiry", c.Core.F+600-lightfallHitmark-burstFrames[action.ActionWalk]+1)
+	}, burstFrames[action.ActionWalk]) // start Q status at earliest point
 
+	// handle Eula Q damage
 	// lightfall hitmark is 600f from cast
 	c.Core.Tasks.Add(func() {
 		//check to make sure it hasn't already exploded due to exiting field
 		if c.Core.Status.Duration(burstKey) > 0 {
 			c.triggerBurst()
 		}
-	}, 600-lightfallHitmark)
+	}, 600-lightfallHitmark) // check if we can trigger Q damage right before Q status would normally expire
 
 	//energy does not deplete until after animation
 	c.ConsumeEnergy(107)