fixup! Fixed emit OnEnemyHit to occur before pre damage mods

Author: shizukayuki

pkg/enemy/attack.go

@@ -24,13 +24,11 @@ var particleIDToElement = []attributes.Element{
 }
 
 func (e *Enemy) HandleAttack(atk *info.AttackEvent) float64 {
-	grp_mult := 1.0
-
+	grpMult := 1.0
 	if !atk.Info.SourceIsSim {
-		grp_mult = e.GroupTagDamageMult(atk.Info.ICDTag, atk.Info.ICDGroup, atk.Info.ActorIndex)
+		grpMult = e.GroupTagDamageMult(atk.Info.ICDTag, atk.Info.ICDGroup, atk.Info.ActorIndex)
 	}
-
-	if grp_mult > 0 {
+	if grpMult > 0 {
 		e.Core.Combat.Events.Emit(event.OnEnemyHit, e, atk)
 	}
 
@@ -59,7 +57,7 @@ func (e *Enemy) HandleAttack(atk *info.AttackEvent) float64 {
 		evt.Write("pre_damage_mods", preDmgModDebug)
 	}
 
-	dmg, crit = e.attack(atk, evt, grp_mult)
+	dmg, crit = e.attack(atk, evt, grpMult)
 
 	// delay damage event to end of the frame
 	e.Core.Combat.Tasks.Add(func() {
@@ -91,7 +89,7 @@ func (e *Enemy) HandleAttack(atk *info.AttackEvent) float64 {
 	return dmg
 }
 
-func (e *Enemy) attack(atk *info.AttackEvent, evt glog.Event, grp_mult float64) (float64, bool) {
+func (e *Enemy) attack(atk *info.AttackEvent, evt glog.Event, grpMult float64) (float64, bool) {
 	// if target is frozen prior to attack landing, set impulse to 0
 	// let the break freeze attack to trigger actual impulse
 	if e.GetAuraDurability(info.ReactionModKeyFrozen) > info.ZeroDur {
@@ -142,7 +140,7 @@ func (e *Enemy) attack(atk *info.AttackEvent, evt glog.Event, grp_mult float64)
 		}
 	}
 
-	damage, isCrit := e.calc(atk, evt, grp_mult)
+	damage, isCrit := e.calc(atk, evt, grpMult)
 
 	// check for hitlag
 	if e.Core.Combat.EnableHitlag {

pkg/enemy/damage.go

@@ -7,12 +7,12 @@ import (
 	"github.com/genshinsim/gcsim/pkg/core/info"
 )
 
-func (e *Enemy) calc(atk *info.AttackEvent, evt glog.Event, grp_mult float64) (float64, bool) {
+func (e *Enemy) calc(atk *info.AttackEvent, evt glog.Event, grpMult float64) (float64, bool) {
 	var isCrit bool
 
 	if atk.Info.AttackTag == attacks.AttackTagDirectLunarCharged ||
 		atk.Info.AttackTag == attacks.AttackTagDirectLunarBloom {
-		e.calcDirectLunar(atk, evt)
+		e.calcDirectLunar(atk, evt, grpMult)
 	}
 
 	elePer := 0.0
@@ -111,19 +111,20 @@ func (e *Enemy) calc(atk *info.AttackEvent, evt glog.Event, grp_mult float64) (f
 		damage *= (atk.Info.AmpMult * (1 + emBonus + reactBonus))
 	}
 
+	// reduce damage by damage group
+	damage *= grpMult
+
 	elevation := atk.Info.Elevation
 	damage *= 1 + elevation
 
-	damage *= grp_mult
-
 	if e.Core.Flags.LogDebug {
 		e.Core.Log.NewEvent(
 			atk.Info.Abil,
 			glog.LogCalc,
 			atk.Info.ActorIndex,
 		).
 			Write("src_frame", atk.SourceFrame).
-			Write("damage_grp_mult", grp_mult).
+			Write("damage_grp_mult", grpMult).
 			Write("damage", damage).
 			Write("abil", atk.Info.Abil).
 			Write("talent", atk.Info.Mult).
@@ -179,7 +180,7 @@ func (e *Enemy) calc(atk *info.AttackEvent, evt glog.Event, grp_mult float64) (f
 	return damage, isCrit
 }
 
-func (e *Enemy) calcDirectLunar(atk *info.AttackEvent, evt glog.Event) (float64, bool) {
+func (e *Enemy) calcDirectLunar(atk *info.AttackEvent, evt glog.Event, grpMult float64) (float64, bool) {
 	var isCrit bool
 
 	// no DMG% for direct lunar damage
@@ -241,11 +242,7 @@ func (e *Enemy) calcDirectLunar(atk *info.AttackEvent, evt glog.Event) (float64,
 	damage *= resmod
 
 	// reduce damage by damage group
-	x := 1.0
-	if !atk.Info.SourceIsSim {
-		x = e.GroupTagDamageMult(atk.Info.ICDTag, atk.Info.ICDGroup, atk.Info.ActorIndex)
-		damage *= x
-	}
+	damage *= grpMult
 
 	elevation := atk.Info.Elevation
 	damage *= 1 + elevation
@@ -276,7 +273,7 @@ func (e *Enemy) calcDirectLunar(atk *info.AttackEvent, evt glog.Event) (float64,
 			atk.Info.ActorIndex,
 		).
 			Write("src_frame", atk.SourceFrame).
-			Write("damage_grp_mult", x).
+			Write("damage_grp_mult", grpMult).
 			Write("damage", damage).
 			Write("abil", atk.Info.Abil).
 			Write("talent", atk.Info.Mult).