bug fixes pt. 2

Author: just1ce5

internal/characters/traveler/common/pyro/asc.go

@@ -6,7 +6,7 @@ const a4OnReactICD = "travelerpyro-a4-icd"
 
 func (c *Traveler) a4() {
 	fReactionHook := func(args ...interface{}) bool {
-		// if PMC is in NS Blessinng, then the active character should
+		// if PMC is in NS Blessing, then the active character should
 		// be inside a Blazing Threshold or Scorching Threshold since it
 		// always follows active character
 		if !c.nightsoulState.HasBlessing() {
@@ -16,11 +16,7 @@ func (c *Traveler) a4() {
 			return false
 		}
 
-		if c.Base.Cons >= 2 && c.StatusIsActive(c2StatusKey) && c.c2ActivationsPerSkill < 2 {
-			c.nightsoulState.GeneratePoints(14)
-		}
-
-		c.AddStatus(a4OnReactICD, 12, false) // TODO: hitlag affected?
+		c.AddStatus(a4OnReactICD, 12, true)
 		c.AddEnergy("travelerpyro-a4-energy", 5)
 		return false
 	}

internal/characters/traveler/common/pyro/burst.go

@@ -48,12 +48,12 @@ func (c *Traveler) Burst(p map[string]int) (action.Info, error) {
 		StrikeType:     attacks.StrikeTypeDefault,
 		Element:        attributes.Pyro,
 		Durability:     25,
-		Mult:           burst[c.TalentLvlSkill()],
+		Mult:           burst[c.TalentLvlBurst()],
 	}
 
 	c.Core.QueueAttack(
 		ai,
-		combat.NewCircleHitOnTarget(c.Core.Combat.PrimaryTarget(), nil, 6.5),
+		combat.NewCircleHitOnTarget(c.Core.Combat.PrimaryTarget(), nil, 4.5),
 		burstHitmark,
 		burstHitmark,
 	)

internal/characters/traveler/common/pyro/cons.go

@@ -5,6 +5,7 @@ import (
 	"github.com/genshinsim/gcsim/pkg/core/attacks"
 	"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/player/character"
 	"github.com/genshinsim/gcsim/pkg/modifier"
 )
@@ -31,7 +32,7 @@ func (c *Traveler) c1AddMod() {
 				}
 				mDmg[attributes.DmgP] = 0.06
 				if this.StatusIsActive(nightsoul.NightsoulBlessingStatus) {
-					mDmg[attributes.DmgP] += 0.06
+					mDmg[attributes.DmgP] += 0.09
 				}
 				return mDmg, true
 			},
@@ -40,6 +41,32 @@ func (c *Traveler) c1AddMod() {
 }
 
 func (c *Traveler) c2() {
+	if c.Base.Cons < 2 {
+		return
+	}
+	fReactionHook := func(args ...interface{}) bool {
+		if c.StatusIsActive(c2StatusKey) {
+			return false
+		}
+
+		if c.c2ActivationsPerSkill < 2 {
+			c.c2ActivationsPerSkill++
+			c.nightsoulState.GeneratePoints(14)
+		}
+
+		return false
+	}
+
+	c.Core.Events.Subscribe(event.OnBurning, fReactionHook, "travelerpyro-c2-onburning")
+	c.Core.Events.Subscribe(event.OnVaporize, fReactionHook, "travelerpyro-a4-onvaporize")
+	c.Core.Events.Subscribe(event.OnMelt, fReactionHook, "travelerpyro-c2-onmelt")
+	c.Core.Events.Subscribe(event.OnOverload, fReactionHook, "travelerpyro-c2-onoverload")
+	c.Core.Events.Subscribe(event.OnBurgeon, fReactionHook, "travelerpyro-c2-onburgeon")
+	c.Core.Events.Subscribe(event.OnSwirlPyro, fReactionHook, "travelerpyro-c2-onswirlpyro")
+	c.Core.Events.Subscribe(event.OnCrystallizePyro, fReactionHook, "travelerpyro-c2-oncrystallizepyro")
+}
+
+func (c *Traveler) c2OnSkill() {
 	if c.Base.Cons < 2 {
 		return
 	}
@@ -77,6 +104,9 @@ func (c *Traveler) c6AddMod() {
 			default:
 				return nil, false
 			}
+			if !c.nightsoulState.HasBlessing() {
+				return nil, false
+			}
 			return mCD, true
 		},
 	})

internal/characters/traveler/common/pyro/skill.go

@@ -10,6 +10,7 @@ import (
 	"github.com/genshinsim/gcsim/pkg/core/combat"
 	"github.com/genshinsim/gcsim/pkg/core/event"
 	"github.com/genshinsim/gcsim/pkg/core/targets"
+	"github.com/genshinsim/gcsim/pkg/enemy"
 )
 
 var skillFrames [][]int
@@ -23,9 +24,11 @@ const (
 	tapCdStart                     = 19
 	holdCdStart                    = 48
 	enterNightsoulDelay            = 19
-	nightsoulReduceDelay           = 10
+	nightsoulReduceDelay           = 8 // From wiki: consumption is 7.5 points per second -> 1 per 8f
+	scorchingThresholdICD          = 180
 	particleICDKey                 = "travelerpyro-particle-icd"
 	scoringThresholdKey            = "travelerpyro-e"
+	scorchingThresholdICDKey       = "travelerpyro-scorching-threshold-icd"
 )
 
 func init() {
@@ -76,7 +79,7 @@ func (c *Traveler) Skill(p map[string]int) (action.Info, error) {
 	}
 
 	c.c1AddMod()
-	c.c2()
+	c.c2OnSkill()
 	c.c6AddMod()
 
 	if hold == 0 {
@@ -90,12 +93,7 @@ func (c *Traveler) SkillTap(p map[string]int) (action.Info, error) {
 	skillSrc := c.Core.F + enterNightsoulDelay
 	c.QueueCharTask(func() {
 		c.nightsoulSrc = skillSrc
-		if c.nightsoulState.HasBlessing() {
-			c.nightsoulState.ClearPoints()
-			c.nightsoulState.GeneratePoints(42)
-		} else {
-			c.nightsoulState.EnterBlessing(42)
-		}
+		c.nightsoulState.EnterTimedBlessing(42, 12*60, nil)
 		c.QueueCharTask(c.nightsoulPointReduceFunc(c.nightsoulSrc), nightsoulReduceDelay)
 	}, enterNightsoulDelay)
 	c.SetCDWithDelay(action.ActionSkill, 18*60, tapCdStart)
@@ -104,18 +102,14 @@ func (c *Traveler) SkillTap(p map[string]int) (action.Info, error) {
 	return action.Info{
 		Frames:          frames.NewAbilFunc(skillFrames[c.gender]),
 		AnimationLength: skillFrames[c.gender][action.InvalidAction],
-		CanQueueAfter:   skillFrames[c.gender][action.ActionDash], // earliest cancel
+		CanQueueAfter:   skillFrames[c.gender][action.ActionSwap], // earliest cancel
 		State:           action.SkillState,
 	}, nil
 }
 
 func (c *Traveler) SkillHold(p map[string]int) (action.Info, error) {
 	c.QueueCharTask(func() {
-		if c.nightsoulState.HasBlessing() {
-			c.nightsoulState.GeneratePoints(42)
-		} else {
-			c.nightsoulState.EnterBlessing(42)
-		}
+		c.nightsoulState.EnterTimedBlessing(42, 12*60, nil)
 		c.nightsoulSrc = c.Core.F
 		c.QueueCharTask(c.nightsoulPointReduceFunc(c.Core.F), nightsoulReduceDelay)
 	}, 48)
@@ -135,7 +129,7 @@ func (c *Traveler) SkillHold(p map[string]int) (action.Info, error) {
 
 	c.Core.QueueAttack(
 		ai,
-		combat.NewCircleHitOnTarget(c.Core.Combat.PrimaryTarget(), nil, 6.5),
+		combat.NewCircleHitOnTarget(c.Core.Combat.PrimaryTarget(), nil, 3.0),
 		skillHoldHitmark,
 		skillHoldHitmark,
 	)
@@ -145,7 +139,7 @@ func (c *Traveler) SkillHold(p map[string]int) (action.Info, error) {
 	return action.Info{
 		Frames:          frames.NewAbilFunc(skillHoldFrames[c.gender]),
 		AnimationLength: skillHoldFrames[c.gender][action.InvalidAction],
-		CanQueueAfter:   skillHoldFrames[c.gender][action.ActionDash], // earliest cancel
+		CanQueueAfter:   skillHoldFrames[c.gender][action.ActionSwap], // earliest cancel
 		State:           action.SkillState,
 	}, nil
 }
@@ -201,10 +195,9 @@ func (c *Traveler) blazingThresholdHit(src int) func() {
 			Durability:     25,
 			Mult:           blazingThreshold[c.TalentLvlSkill()],
 		}
-		// TODO: change hurtbox
-		radius := 4.
+		radius := 0.5
 		if c.Base.Ascension >= 1 && c.nightsoulState.Points() >= 20 {
-			radius = 6.
+			radius = 3.
 		}
 		c.Core.QueueAttack(ai, combat.NewCircleHitOnTarget(c.Core.Combat.Player(), nil, radius), 0, 0, c.particleCB)
 		c.QueueCharTask(c.blazingThresholdHit(src), blazingThresholdInterval)
@@ -213,9 +206,13 @@ func (c *Traveler) blazingThresholdHit(src int) func() {
 
 func (c *Traveler) scorchingThresholdOnDamage() {
 	c.Core.Events.Subscribe(event.OnEnemyDamage, func(args ...interface{}) bool {
+		_, ok := args[0].(*enemy.Enemy)
 		ae := args[1].(*combat.AttackEvent)
 		dmg := args[2].(float64)
-		if c.scorchingThresholdICD > c.Core.F {
+		if !ok {
+			return false
+		}
+		if c.StatusIsActive(scorchingThresholdICDKey) {
 			return false
 		}
 		if !c.StatusIsActive(scoringThresholdKey) {
@@ -227,20 +224,14 @@ func (c *Traveler) scorchingThresholdOnDamage() {
 			ae.Info.AttackTag == attacks.AttackTagSwirlHydro {
 			return false
 		}
-		// ignore self dmg
-		if ae.Info.ActorIndex == c.Index &&
-			ae.Info.AttackTag == attacks.AttackTagElementalArt &&
-			ae.Info.StrikeType == attacks.StrikeTypeSlash {
-			return false
-		}
 		// ignore 0 damage
 		if dmg == 0 {
 			return false
 		}
 
 		ai := combat.AttackInfo{
 			ActorIndex:     c.Index,
-			Abil:           "Scorching Threshold DMG",
+			Abil:           "Scorching Threshold",
 			AttackTag:      attacks.AttackTagElementalArt,
 			AdditionalTags: []attacks.AdditionalTag{attacks.AdditionalTagNightsoul},
 			ICDTag:         attacks.ICDTagTravelerScorchingThreshold,
@@ -250,15 +241,14 @@ func (c *Traveler) scorchingThresholdOnDamage() {
 			Durability:     25,
 			Mult:           scorchingThreshold[c.TalentLvlSkill()],
 		}
-		// TODO: change hurtbox
-		radius := 4.
+		radius := 1.5
 		if c.Base.Ascension >= 1 && c.nightsoulState.Points() >= 20 {
-			radius = 6.
+			radius = 4.
 		}
 		c.Core.QueueAttack(ai, combat.NewCircleHitOnTarget(c.Core.Combat.Player(), nil, radius),
 			scorchingThresholdHitmarkDelay, scorchingThresholdHitmarkDelay, c.particleCB)
 
-		c.scorchingThresholdICD = c.Core.F + 180 // 3 sec icd
+		c.AddStatus(scorchingThresholdICDKey, scorchingThresholdICD, false)
 		return false
 	}, "travelerpyro-scorching-threshold")
 }

internal/characters/traveler/common/pyro/stats.go

@@ -164,69 +164,73 @@ var (
 			},
 		},
 	}
+	// skill: blazingThreshold = [0]
 	blazingThreshold = []float64{
-		0.281,
-		0.302,
-		0.323,
+		0.2808,
+		0.30186,
+		0.32292,
 		0.351,
-		0.372,
-		0.393,
-		0.421,
-		0.449,
+		0.37206,
+		0.39312,
+		0.4212,
+		0.44928,
 		0.47736,
-		0.505,
-		0.534,
+		0.50544,
+		0.53352,
 		0.5616,
-		0.597,
-		0.632,
-		0.667,
+		0.5967,
+		0.6318,
+		0.6669,
 	}
+	// skill: holdDMG = [1]
 	holdDMG = []float64{
 		0.988,
-		1.062,
-		1.136,
+		1.0621,
+		1.1362,
 		1.235,
-		1.309,
-		1.383,
+		1.3091,
+		1.3832,
 		1.482,
-		1.581,
+		1.5808,
 		1.6796,
-		1.778,
-		1.877,
+		1.7784,
+		1.8772,
 		1.976,
-		2.100,
+		2.0995,
 		2.223,
-		2.346,
+		2.3465,
 	}
+	// skill: scorchingThreshold = [2]
 	scorchingThreshold = []float64{
-		0.814,
-		0.875,
-		0.937,
+		0.8144,
+		0.87548,
+		0.93656,
 		1.018,
-		1.079,
-		1.14,
-		1.222,
-		1.303,
-		1.384,
-		1.466,
-		1.547,
-		1.629,
-		1.731,
-		1.832,
-		1.934,
+		1.07908,
+		1.14016,
+		1.2216,
+		1.30304,
+		1.38448,
+		1.46592,
+		1.54736,
+		1.6288,
+		1.7306,
+		1.8324,
+		1.9342,
 	}
+	// burst: burst = [0]
 	burst = []float64{
 		4.272,
-		4.592,
-		4.913,
-		5.340,
-		5.660,
-		5.981,
+		4.5924,
+		4.9128,
+		5.34,
+		5.6604,
+		5.9808,
 		6.408,
-		6.835,
+		6.8352,
 		7.2624,
-		7.690,
-		8.117,
+		7.6896,
+		8.1168,
 		8.544,
 		9.078,
 		9.612,

internal/characters/traveler/common/pyro/travelerpyro.go

@@ -15,7 +15,6 @@ type Traveler struct {
 	*tmpl.Character
 	nightsoulState        *nightsoul.State
 	nightsoulSrc          int
-	scorchingThresholdICD int
 	gender                int
 	c2ActivationsPerSkill int
 }
@@ -44,6 +43,7 @@ func NewTraveler(s *core.Core, w *character.CharWrapper, p info.CharacterProfile
 func (c *Traveler) Init() error {
 	c.scorchingThresholdOnDamage()
 	c.a4()
+	c.c2()
 	return nil
 }