Fix regression in Nilou A4 caused by bloom snapshot (#2345)

genshinsim · Feb 19, 2025 · ab67431 · ab67431
1 parent cea8dc9
commit ab67431
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/internal/characters/nilou/asc.go b/internal/characters/nilou/asc.go
@@ -99,15 +99,7 @@ func (c *char) a4() {
 				if ai.AttackTag != attacks.AttackTagBloom {
 					return 0, false
 				}
-
-				// check is bountiful core?
-				var t combat.Gadget
-				for _, v := range c.Core.Combat.Gadgets() {
-					if v != nil && v.Key() == ai.DamageSrc {
-						t = v
-					}
-				}
-				if _, ok := t.(*BountifulCore); !ok {
+				if ai.ICDTag != attacks.ICDTagBountifulCoreDamage {
 					return 0, false
 				}
 

diff --git a/internal/characters/nilou/bountifulcore.go b/internal/characters/nilou/bountifulcore.go
@@ -2,6 +2,7 @@ package nilou
 
 import (
 	"github.com/genshinsim/gcsim/pkg/core"
+	"github.com/genshinsim/gcsim/pkg/core/attacks"
 	"github.com/genshinsim/gcsim/pkg/core/combat"
 	"github.com/genshinsim/gcsim/pkg/core/event"
 	"github.com/genshinsim/gcsim/pkg/core/geometry"
@@ -28,7 +29,12 @@ func newBountifulCore(c *core.Core, p geometry.Point, a *combat.AttackEvent) *Bo
 	char := b.Core.Player.ByIndex(a.Info.ActorIndex)
 	explode := func() {
 		c.Tasks.Add(func() {
-			ai, snap := reactable.NewBloomAttack(char, b)
+			ai, snap := reactable.NewBloomAttack(char, b, func(atk *combat.AttackInfo) {
+				// atk.Abil += " (bountiful core)"
+				// FIXME: some external code only match against AttackTagBloom. fix A4 if you uncomment this
+				// atk.AttackTag = attacks.AttackTagBountifulCore
+				atk.ICDTag = attacks.ICDTagBountifulCoreDamage
+			})
 			ap := combat.NewCircleHitOnTarget(b.Gadget, nil, 6.5)
 			c.QueueAttackWithSnap(ai, snap, ap, 0)
 

diff --git a/pkg/core/attacks/attack.go b/pkg/core/attacks/attack.go
@@ -24,6 +24,7 @@ const (
 	AttackTagSwirlElectro
 	AttackTagBurningDamage
 	AttackTagBloom
+	AttackTagBountifulCore // special tag for nilou
 	AttackTagBurgeon
 	AttackTagHyperbloom
 	AttackTagLength

diff --git a/pkg/core/attacks/icd.go b/pkg/core/attacks/icd.go
@@ -34,6 +34,7 @@ const (
 	ICDTagSwirlElectro
 	ICDTagBurningDamage
 	ICDTagBloomDamage
+	ICDTagBountifulCoreDamage // special tag for nilou
 	ICDTagBurgeonDamage
 	ICDTagHyperbloomDamage
 

diff --git a/pkg/reactable/bloom.go b/pkg/reactable/bloom.go
@@ -117,7 +117,7 @@ func NewDendroCore(c *core.Core, shp geometry.Shape, a *combat.AttackEvent) *Den
 	explode := func(reason string) func() {
 		return func() {
 			s.Core.Tasks.Add(func() {
-				ai, snap := NewBloomAttack(char, s)
+				ai, snap := NewBloomAttack(char, s, nil)
 				ap := combat.NewCircleHitOnTarget(s, nil, 5)
 				c.QueueAttackWithSnap(ai, snap, ap, 0)
 
@@ -233,7 +233,7 @@ const (
 	HyperbloomMultiplier = 3
 )
 
-func NewBloomAttack(char *character.CharWrapper, src combat.Target) (combat.AttackInfo, combat.Snapshot) {
+func NewBloomAttack(char *character.CharWrapper, src combat.Target, modify func(*combat.AttackInfo)) (combat.AttackInfo, combat.Snapshot) {
 	em := char.Stat(attributes.EM)
 	ai := combat.AttackInfo{
 		ActorIndex:       char.Index,
@@ -246,6 +246,9 @@ func NewBloomAttack(char *character.CharWrapper, src combat.Target) (combat.Atta
 		Abil:             string(reactions.Bloom),
 		IgnoreDefPercent: 1,
 	}
+	if modify != nil {
+		modify(&ai)
+	}
 	flatdmg, snap := calcReactionDmg(char, ai, em)
 	ai.FlatDmg = BloomMultiplier * flatdmg
 	return ai, snap