fix varesa a1 buff for mini burst

Author: imring

internal/characters/varesa/asc.go

@@ -12,24 +12,38 @@ import (
 
 const a1Status = "rainbow-crash"
 
+func (c *char) updateA1Bonus(src int) {
+	if c.Base.Ascension < 1 {
+		return
+	}
+	c.QueueCharTask(func() {
+		if c.a1Src != src {
+			return
+		}
+		c.a1Atk = c.TotalAtk()
+		c.updateA1Bonus(src)
+	}, 0.1*60)
+}
+
 func (c *char) a1() {
 	if c.Base.Ascension < 1 {
 		return
 	}
 	c.AddStatus(a1Status, 5*60, true)
 }
 
-func (c *char) a1PlungeBuff() float64 {
+func (c *char) a1PlungeBonus() float64 {
 	if c.Base.Ascension < 1 {
 		return 0.0
 	}
 	if !c.StatusIsActive(a1Status) {
 		return 0.0
 	}
+	mult := 0.5
 	if c.Base.Cons >= 1 || c.nightsoulState.HasBlessing() {
-		return 1.8
+		mult = 1.8
 	}
-	return 0.5
+	return mult * c.a1Atk
 }
 
 func (c *char) a1Cancel(a combat.AttackCB) {

internal/characters/varesa/burst.go

@@ -90,6 +90,10 @@ func (c *char) Burst(p map[string]int) (action.Info, error) {
 }
 
 func (c *char) volcanicKablam() action.Info {
+	if c.Base.Cons >= 1 {
+		c.a1()
+	}
+
 	ai := combat.AttackInfo{
 		ActorIndex:     c.Index,
 		Abil:           kablamAbil,
@@ -103,10 +107,7 @@ func (c *char) volcanicKablam() action.Info {
 		Durability:     25,
 		Mult:           kablam[c.TalentLvlBurst()],
 		HitlagFactor:   0.1,
-	}
-
-	if c.Base.Cons >= 1 {
-		c.a1()
+		FlatDmg:        c.a1PlungeBonus(),
 	}
 
 	c.Core.Tasks.Add(func() {
@@ -115,6 +116,7 @@ func (c *char) volcanicKablam() action.Info {
 			combat.NewCircleHit(c.Core.Combat.Player(), c.Core.Combat.PrimaryTarget(), geometry.Point{Y: 1}, 7.5),
 			0,
 			0,
+			c.a1Cancel,
 		)
 		c.DeleteStatus(apexState)
 	}, kablamHitmark)

internal/characters/varesa/plunge.go

@@ -158,7 +158,7 @@ func (c *char) highPlungeCA(p map[string]int) action.Info {
 		Element:        attributes.Electro,
 		Durability:     25,
 		Mult:           highPlunge[c.TalentLvlAttack()],
-		FlatDmg:        c.c4FlatBonus(),
+		FlatDmg:        c.a1PlungeBonus() + c.c4FlatBonus(),
 		HitlagFactor:   0.1,
 	}
 
@@ -176,7 +176,6 @@ func (c *char) highPlungeCA(p map[string]int) action.Info {
 	} else {
 		c.QueueCharTask(c.generatePlungeNightsoul, hitmark)
 	}
-	ai.Mult += c.a1PlungeBuff()
 	c.getApexDrive()
 
 	c.Core.QueueAttack(
@@ -219,7 +218,7 @@ func (c *char) highPlungeXY(p map[string]int) action.Info {
 		Element:        attributes.Electro,
 		Durability:     25,
 		Mult:           highPlunge[c.TalentLvlAttack()],
-		FlatDmg:        c.c4FlatBonus(),
+		FlatDmg:        c.a1PlungeBonus() + c.c4FlatBonus(),
 		HitlagFactor:   0.1,
 	}
 
@@ -237,7 +236,6 @@ func (c *char) highPlungeXY(p map[string]int) action.Info {
 	} else {
 		c.QueueCharTask(c.generatePlungeNightsoul, hitmark)
 	}
-	ai.Mult += c.a1PlungeBuff()
 	c.getApexDrive()
 
 	c.Core.QueueAttack(
@@ -280,7 +278,7 @@ func (c *char) lowPlungeXY(p map[string]int) action.Info {
 		Element:        attributes.Electro,
 		Durability:     25,
 		Mult:           lowPlunge[c.TalentLvlAttack()],
-		FlatDmg:        c.c4FlatBonus(),
+		FlatDmg:        c.a1PlungeBonus() + c.c4FlatBonus(),
 		HitlagFactor:   0.1,
 	}
 
@@ -298,7 +296,6 @@ func (c *char) lowPlungeXY(p map[string]int) action.Info {
 	} else {
 		c.QueueCharTask(c.generatePlungeNightsoul, hitmark)
 	}
-	ai.Mult += c.a1PlungeBuff()
 	c.getApexDrive()
 
 	c.Core.QueueAttack(

internal/characters/varesa/varesa.go

@@ -23,6 +23,8 @@ type char struct {
 	particleGenerated bool
 	freeSkill         bool
 	exitNS            bool
+	a1Src             int
+	a1Atk             float64
 	a4Stacks          *stacks.MultipleRefreshNoRemove
 	usedShortBurst    bool
 }
@@ -47,6 +49,8 @@ func NewChar(s *core.Core, w *character.CharWrapper, _ info.CharacterProfile) er
 }
 
 func (c *char) Init() error {
+	c.a1Src = c.Core.F
+	c.updateA1Bonus(c.a1Src)
 	c.a4()
 	c.c4()
 	c.c6()