Skip to content

refactor reactions and combat events into info package; add reactable interface #2467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srliao merged 6 commits into from
Sep 16, 2025
Merged

refactor reactions and combat events into info package; add reactable interface #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3d8a3f
move core/reactions to model/reactions
srliao Sep 11, 2025
5736e7d
move reactiontype and durability to model
srliao Sep 11, 2025
07603a6
move attackevent and target into model
srliao Sep 15, 2025
a6fc52f
fix pyro traveler
srliao Sep 15, 2025
88df154
add reactable interface
srliao Sep 15, 2025
7b18b2c
change to use pkg/core/info instead of model
srliao Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions internal/artifacts/berserker/berserker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package berserker
import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
"github.com/genshinsim/gcsim/pkg/core/player/character"
Expand Down Expand Up @@ -44,7 +43,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
m[attributes.CR] = 0.24
char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("berserker-4pc", -1),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
if char.CurrentHPRatio() > 0.7 {
return nil, false
}
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/blizzard/blizzard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package blizzard
import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
"github.com/genshinsim/gcsim/pkg/core/player/character"
Expand Down Expand Up @@ -41,7 +40,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
m := make([]float64, attributes.EndStatType)
char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("bs-4pc", -1),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
r, ok := t.(core.Reactable)
if !ok {
return nil, false
Expand Down
5 changes: 2 additions & 3 deletions internal/artifacts/bloodstained/bloodstained.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core/action"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
Expand Down Expand Up @@ -59,7 +58,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
if !ok {
return false
}
atk := args[1].(*combat.AttackEvent)
atk := args[1].(*info.AttackEvent)
// don't proc if someone else defeated the enemy
if atk.Info.ActorIndex != char.Index {
return false
Expand All @@ -72,7 +71,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
// charged attack dmg% part
char.AddAttackMod(character.AttackMod{
Base: modifier.NewBaseWithHitlag("bloodstained-4pc-dmg%", 600),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
if atk.Info.AttackTag != attacks.AttackTagExtra {
return nil, false
}
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/bolide/bolide.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
"github.com/genshinsim/gcsim/pkg/core/player/character"
Expand Down Expand Up @@ -38,7 +37,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
m[attributes.DmgP] = 0.4
char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("bolide-4pc", -1),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
if atk.Info.AttackTag != attacks.AttackTagNormal && atk.Info.AttackTag != attacks.AttackTagExtra {
return nil, false
}
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/braveheart/braveheart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package braveheart
import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
"github.com/genshinsim/gcsim/pkg/core/player/character"
Expand Down Expand Up @@ -52,7 +51,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
m[attributes.DmgP] = 0.30
char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("braveheart-4pc", -1),
Amount: func(_ *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(_ *info.AttackEvent, t info.Target) ([]float64, bool) {
x, ok := t.(*enemy.Enemy)
if !ok {
return nil, false
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/crimson/crimson.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/glog"
"github.com/genshinsim/gcsim/pkg/core/info"
Expand Down Expand Up @@ -80,7 +79,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri

char.AddReactBonusMod(character.ReactBonusMod{
Base: modifier.NewBase("crimson-4pc", -1),
Amount: func(ai combat.AttackInfo) (float64, bool) {
Amount: func(ai info.AttackInfo) (float64, bool) {
switch ai.AttackTag {
case attacks.AttackTagOverloadDamage,
attacks.AttackTagBurningDamage,
Expand Down
2 changes: 1 addition & 1 deletion internal/artifacts/deepwood/deepwood.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
}
if count >= 4 {
c.Events.Subscribe(event.OnEnemyDamage, func(args ...interface{}) bool {
atk := args[1].(*combat.AttackEvent)
atk := args[1].(*info.AttackEvent)
t, ok := args[0].(*enemy.Enemy)
if !ok {
return false
Expand Down
5 changes: 2 additions & 3 deletions internal/artifacts/desertpavilionchronicle/desertpavilionchronicle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core/action"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
Expand Down Expand Up @@ -49,7 +48,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri

if count >= 4 {
c.Events.Subscribe(event.OnEnemyDamage, func(args ...interface{}) bool {
atk := args[1].(*combat.AttackEvent)
atk := args[1].(*info.AttackEvent)
if atk.Info.ActorIndex != char.Index {
return false
}
Expand All @@ -74,7 +73,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
mDmg[attributes.DmgP] = 0.4
char.AddAttackMod(character.AttackMod{
Base: modifier.NewBaseWithHitlag("desert-4pc-dmg", 15*60),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
switch atk.Info.AttackTag {
case attacks.AttackTagNormal:
case attacks.AttackTagExtra:
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/echoes/echoes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/glog"
"github.com/genshinsim/gcsim/pkg/core/info"
Expand Down Expand Up @@ -70,7 +69,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
}

// If attack does not belong to the equipped character then ignore
atk := args[1].(*combat.AttackEvent)
atk := args[1].(*info.AttackEvent)
if atk.Info.ActorIndex != char.Index {
return false
}
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/emblem/emblem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
"github.com/genshinsim/gcsim/pkg/core/player/character"
Expand Down Expand Up @@ -49,7 +48,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri

char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("emblem-4pc", -1),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
if atk.Info.AttackTag != attacks.AttackTagElementalBurst {
return nil, false
}
Expand Down
5 changes: 2 additions & 3 deletions internal/artifacts/finaleofthedeepgalleries/finaleofthedeepgalleries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/glog"
"github.com/genshinsim/gcsim/pkg/core/info"
Expand Down Expand Up @@ -78,7 +77,7 @@ func (s *Set) pc4() {

s.char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("deep-galleries-4pc", -1),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
if s.char.Energy != 0 {
return nil, false
}
Expand All @@ -97,7 +96,7 @@ func (s *Set) pc4() {

s.c.Events.Subscribe(event.OnEnemyDamage, func(args ...interface{}) bool {
// If attack does not belong to the equipped character then ignore
atk := args[1].(*combat.AttackEvent)
atk := args[1].(*info.AttackEvent)
if atk.Info.ActorIndex != s.char.Index {
return false
}
Expand Down
7 changes: 3 additions & 4 deletions internal/artifacts/flowerofparadiselost/flowerofparadiselost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/glog"
"github.com/genshinsim/gcsim/pkg/core/info"
Expand Down Expand Up @@ -62,7 +61,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
if count >= 4 {
char.AddReactBonusMod(character.ReactBonusMod{
Base: modifier.NewBase("flower-4pc", -1),
Amount: func(ai combat.AttackInfo) (float64, bool) {
Amount: func(ai info.AttackInfo) (float64, bool) {
switch ai.AttackTag {
case attacks.AttackTagBloom:
case attacks.AttackTagHyperbloom:
Expand All @@ -76,7 +75,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri

//nolint:unparam // ignoring for now, event refactor should get rid of bool return of event sub
f := func(args ...interface{}) bool {
atk := args[1].(*combat.AttackEvent)
atk := args[1].(*info.AttackEvent)
if atk.Info.ActorIndex != char.Index {
return false
}
Expand All @@ -97,7 +96,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri

char.AddReactBonusMod(character.ReactBonusMod{
Base: modifier.NewBaseWithHitlag(buffKey, 10*60),
Amount: func(ai combat.AttackInfo) (float64, bool) {
Amount: func(ai info.AttackInfo) (float64, bool) {
switch ai.AttackTag {
case attacks.AttackTagBloom:
case attacks.AttackTagHyperbloom:
Expand Down
5 changes: 2 additions & 3 deletions internal/artifacts/gambler/gambler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core/action"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/glog"
"github.com/genshinsim/gcsim/pkg/core/info"
Expand Down Expand Up @@ -40,7 +39,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
m[attributes.DmgP] = 0.20
char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("gambler-2pc", -1),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
if atk.Info.AttackTag != attacks.AttackTagElementalArt {
return nil, false
}
Expand All @@ -62,7 +61,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
if !ok {
return false
}
atk := args[1].(*combat.AttackEvent)
atk := args[1].(*info.AttackEvent)
// don't proc if someone else defeated the enemy
if atk.Info.ActorIndex != char.Index {
return false
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/gildeddreams/gildeddreams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/glog"
"github.com/genshinsim/gcsim/pkg/core/info"
Expand Down Expand Up @@ -84,7 +83,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
if count >= 4 {
const icdKey = "gd-4pc-icd"
add := func(args ...interface{}) bool {
atk := args[1].(*combat.AttackEvent)
atk := args[1].(*info.AttackEvent)
if atk.Info.ActorIndex != char.Index {
return false
}
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/gladiator/gladiator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
"github.com/genshinsim/gcsim/pkg/core/player/character"
Expand Down Expand Up @@ -41,7 +40,7 @@ func (s *Set) Init() error {
m[attributes.DmgP] = 0.35
s.char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("glad-4pc", -1),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
if atk.Info.AttackTag != attacks.AttackTagNormal {
return nil, false
}
Expand Down
5 changes: 2 additions & 3 deletions internal/artifacts/goldentroupe/goldentroupe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/glog"
"github.com/genshinsim/gcsim/pkg/core/info"
Expand Down Expand Up @@ -54,7 +53,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
m[attributes.DmgP] = 0.2
char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("troupe-2pc", -1),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
if atk.Info.AttackTag != attacks.AttackTagElementalArt && atk.Info.AttackTag != attacks.AttackTagElementalArtHold {
return nil, false
}
Expand Down Expand Up @@ -84,7 +83,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri

char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("troupe-4pc", -1),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
if atk.Info.AttackTag != attacks.AttackTagElementalArt && atk.Info.AttackTag != attacks.AttackTagElementalArtHold {
return nil, false
}
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/heartofdepth/heartofdepth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attacks"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
Expand Down Expand Up @@ -57,7 +56,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
// add stat mod here
char.AddAttackMod(character.AttackMod{
Base: modifier.NewBaseWithHitlag("hod-4pc", buffDuration),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
if atk.Info.AttackTag != attacks.AttackTagNormal && atk.Info.AttackTag != attacks.AttackTagExtra {
return nil, false
}
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/huskofopulentdreams/huskofopulentdreams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/glog"
"github.com/genshinsim/gcsim/pkg/core/info"
Expand Down Expand Up @@ -100,7 +99,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
}, fmt.Sprintf("husk-4pc-off-field-gain-%v", char.Base.Key.String()))

c.Events.Subscribe(event.OnEnemyDamage, func(args ...interface{}) bool {
atk := args[1].(*combat.AttackEvent)
atk := args[1].(*info.AttackEvent)
// Only triggers when onfield
if c.Player.Active() != char.Index {
return false
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/instructor/instructor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/event"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
Expand Down Expand Up @@ -49,7 +48,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri

// TODO: does multiple instructor holders extend the duration?
add := func(args ...interface{}) bool {
atk := args[1].(*combat.AttackEvent)
atk := args[1].(*info.AttackEvent)
// Character must be on field to proc bonus
if c.Player.Active() != char.Index {
return false
Expand Down
3 changes: 1 addition & 2 deletions internal/artifacts/lavawalker/lavawalker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package lavawalker
import (
"github.com/genshinsim/gcsim/pkg/core"
"github.com/genshinsim/gcsim/pkg/core/attributes"
"github.com/genshinsim/gcsim/pkg/core/combat"
"github.com/genshinsim/gcsim/pkg/core/glog"
"github.com/genshinsim/gcsim/pkg/core/info"
"github.com/genshinsim/gcsim/pkg/core/keys"
Expand Down Expand Up @@ -35,7 +34,7 @@ func NewSet(c *core.Core, char *character.CharWrapper, count int, param map[stri
m[attributes.DmgP] = 0.35
char.AddAttackMod(character.AttackMod{
Base: modifier.NewBase("lavawalker-4pc", -1),
Amount: func(atk *combat.AttackEvent, t combat.Target) ([]float64, bool) {
Amount: func(atk *info.AttackEvent, t info.Target) ([]float64, bool) {
r, ok := t.(core.Reactable)
if !ok {
return nil, false
Expand Down
Loading