fix c6 infusion check and activate on burst (#568)

- kazu c6 infusion now properly only activates at c6 - add c6 infusion to burst cast
genshinsim · May 27, 2022 · 260bedd · 260bedd
1 parent 9d292f0
commit 260bedd
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/internal/characters/kazuha/abil.go b/internal/characters/kazuha/abil.go
@@ -157,15 +157,14 @@ func (c *char) skillPress(p map[string]int) (int, int) {
 	}
 	if c.Base.Cons == 6 {
 		c.c6Active = c.Core.F + f + 300
+		c.AddWeaponInfuse(core.WeaponInfusion{
+			Key:    "kazuha-c6-infusion",
+			Ele:    core.Anemo,
+			Tags:   []core.AttackTag{core.AttackTagNormal, core.AttackTagExtra, core.AttackTagPlunge},
+			Expiry: c.Core.F + f + 300,
+		})
 	}
 
-	c.AddWeaponInfuse(core.WeaponInfusion{
-		Key:    "kazuha-c6-infusion",
-		Ele:    core.Anemo,
-		Tags:   []core.AttackTag{core.AttackTagNormal, core.AttackTagExtra, core.AttackTagPlunge},
-		Expiry: c.Core.F + f + 300,
-	})
-
 	c.SetCD(core.ActionSkill, cd)
 
 	return f, a
@@ -197,15 +196,14 @@ func (c *char) skillHold(p map[string]int) (int, int) {
 
 	if c.Base.Cons == 6 {
 		c.c6Active = c.Core.F + f + 300
+		c.AddWeaponInfuse(core.WeaponInfusion{
+			Key:    "kazuha-c6-infusion",
+			Ele:    core.Anemo,
+			Tags:   []core.AttackTag{core.AttackTagNormal, core.AttackTagExtra, core.AttackTagPlunge},
+			Expiry: c.Core.F + f + 300,
+		})
 	}
 
-	c.AddWeaponInfuse(core.WeaponInfusion{
-		Key:    "kazuha-c6-infusion",
-		Ele:    core.Anemo,
-		Tags:   []core.AttackTag{core.AttackTagNormal, core.AttackTagExtra, core.AttackTagPlunge},
-		Expiry: c.Core.F + f + 300,
-	})
-
 	c.SetCD(core.ActionSkill, cd)
 	return f, a
 }
@@ -285,6 +283,12 @@ func (c *char) Burst(p map[string]int) (int, int) {
 
 	if c.Base.Cons == 6 {
 		c.c6Active = c.Core.F + f + 300
+		c.AddWeaponInfuse(core.WeaponInfusion{
+			Key:    "kazuha-c6-infusion",
+			Ele:    core.Anemo,
+			Tags:   []core.AttackTag{core.AttackTagNormal, core.AttackTagExtra, core.AttackTagPlunge},
+			Expiry: c.Core.F + f + 300,
+		})
 	}
 
 	c.SetCDWithDelay(core.ActionBurst, 15*60, 7)