Moved GetMoonsignLevel to player. Added util func to check if reaction is lunar

Author: Charlie-Zheng

internal/artifacts/silkenmoonsserenade/silkenmoonsserenade.go

@@ -53,13 +53,14 @@ func (s *Set) Init() error {
 	}
 
 	m2 := make([]float64, attributes.EndStatType)
-	switch s.getMoonsignLevel() {
+	switch s.core.Player.GetMoonsignLevel() {
 	case 0:
 	case 1:
 		m2[attributes.EM] = 60
 	default:
 		m2[attributes.EM] = 120
 	}
+
 	hook := func(args ...any) bool {
 		if _, ok := args[0].(*enemy.Enemy); !ok {
 			return false
@@ -96,10 +97,7 @@ func (s *Set) Init() error {
 		char.AddReactBonusMod(character.ReactBonusMod{
 			Base: modifier.NewBase(gleamingMoonDevotionReactKey, -1),
 			Amount: func(ai info.AttackInfo) (float64, bool) {
-				switch ai.AttackTag {
-				case attacks.AttackTagDirectLunarCharged:
-				case attacks.AttackTagReactionLunarCharge:
-				default:
+				if !attacks.AttackTagIsLunar(ai.AttackTag) {
 					return 0, false
 				}
 
@@ -122,14 +120,6 @@ func (s *Set) Init() error {
 	return nil
 }
 
-func (s *Set) getMoonsignLevel() int {
-	count := 0
-	for _, c := range s.core.Player.Chars() {
-		count += c.Moonsign
-	}
-	return count
-}
-
 func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[string]int) (info.Set, error) {
 	s := Set{
 		char:  char,

pkg/core/attacks/attack.go

@@ -58,3 +58,9 @@ const (
 	AdditionalTagNightsoul
 	AdditionalTagKinichCannon
 )
+
+func AttackTagIsLunar(tag AttackTag) bool {
+	isReaction := LunarReactionStartDelim < tag && tag < LunarReactionEndDelim
+	isDirect := DirectLunarReactionStartDelim < tag && tag < DirectLunarReactionEndDelim
+	return isReaction || isDirect
+}

pkg/core/player/player.go

@@ -342,3 +342,11 @@ func (h *Handler) Airborne() AirborneSource {
 const (
 	XianyunAirborneBuff = "xianyun-airborne-buff"
 )
+
+func (h *Handler) GetMoonsignLevel() int {
+	count := 0
+	for _, c := range h.Chars() {
+		count += c.Moonsign
+	}
+	return count
+}

pkg/simulation/setup.go

@@ -423,10 +423,7 @@ func setupAscendantGleam(core *core.Core) {
 			c.AddReactBonusMod(character.ReactBonusMod{
 				Base: modifier.NewBase("ascendant-gleam", 20*60),
 				Amount: func(ai info.AttackInfo) (float64, bool) {
-					lunarReact := (attacks.LunarReactionStartDelim < ai.AttackTag && ai.AttackTag < attacks.LunarReactionEndDelim)
-					directLunar := (attacks.DirectLunarReactionStartDelim < ai.AttackTag && ai.AttackTag < attacks.DirectLunarReactionEndDelim)
-
-					if !lunarReact && !directLunar {
+					if !attacks.AttackTagIsLunar(ai.AttackTag) {
 						return 0, false
 					}
 					if core.Flags.LogDebug {