Skip to content

Commit deb4d25

Browse files
authored
Update impls with CanDispel + bugfixes to Buffs/Debuffs (#335)
Update existing implementations with `CanDispel: true,` where needed, by checking modifiers that are Buffs or Debuffs There are only a handful of currently known "Dispellable Other"-type modifiers on characters (i.e., Firefly, Jade, MarchHunt, ) and LCs (i.e., Earthly Escapade), all of which are unimplemented at this time Additional notes: * fix DHIL A4, Cornucopia (LC) to correctly be considered Other instead of Buff * fix Bronya E2 Spd Buff with correct Stacking and Flag * fix Bronya Skill Buff with correct Stacking * fix Bronya A4 with correct Stacking * fix Bronya Ult with correct Stacking * fix Gepard Ult with correct Stacking * fix Qingque Talent Atk Buff with correct Stacking * fix Huohuo Ult Atk Buff with correct Stacking * fix Silver Wolf E6 with correct StatusType/remove unnecessary fields * fix Kafka E1 Debuff to correctly apply damage taken increase * fix Mutual Demise (LC) with correct stacking * Blade will be reworked in a separate PR * Something Irreplacable (LC) will be reworked in a separate PR
1 parent 3d4e16c commit deb4d25

File tree

94 files changed

+132
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+132
-23
lines changed

internal/character/asta/ult.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ func init() {
1717
Stacking: modifier.ReplaceBySource,
1818
StatusType: model.StatusType_STATUS_BUFF,
1919
BehaviorFlags: []model.BehaviorFlag{model.BehaviorFlag_STAT_SPEED_UP},
20+
CanDispel: true,
2021
Duration: 2,
2122
})
2223
}

internal/character/bronya/eidolon.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ func init() {
3232
})
3333

3434
modifier.Register(E2Buff, modifier.Config{
35-
StatusType: model.StatusType_STATUS_BUFF,
36-
Duration: 1,
35+
StatusType: model.StatusType_STATUS_BUFF,
36+
Stacking: modifier.ReplaceBySource,
37+
BehaviorFlags: []model.BehaviorFlag{model.BehaviorFlag_STAT_SPEED_UP},
38+
CanDispel: true,
39+
Duration: 1,
3740
})
3841

3942
modifier.Register(E4Cooldown, modifier.Config{

internal/character/bronya/skill.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ const (
1515
func init() {
1616
modifier.Register(Skill, modifier.Config{
1717
StatusType: model.StatusType_STATUS_BUFF,
18+
Stacking: modifier.ReplaceBySource,
19+
CanDispel: true,
1820
})
1921
}
2022

internal/character/bronya/technique.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const (
1515
func init() {
1616
modifier.Register(Technique, modifier.Config{
1717
StatusType: model.StatusType_STATUS_BUFF,
18+
CanDispel: true,
1819
Listeners: modifier.Listeners{
1920
OnAdd: func(mod *modifier.Instance) {
2021
mod.SetProperty(prop.ATKPercent, 0.15)

internal/character/bronya/trace.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ func init() {
3030
// A4 Register
3131
modifier.Register(A4, modifier.Config{
3232
StatusType: model.StatusType_STATUS_BUFF,
33+
Stacking: modifier.ReplaceBySource,
34+
CanDispel: true,
3335
Listeners: modifier.Listeners{
3436
OnAdd: func(mod *modifier.Instance) {
3537
mod.SetProperty(prop.DEFPercent, 0.2)

internal/character/bronya/ult.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ const (
1515
func init() {
1616
modifier.Register(Ult, modifier.Config{
1717
StatusType: model.StatusType_STATUS_BUFF,
18+
Stacking: modifier.ReplaceBySource,
19+
CanDispel: true,
1820
Duration: 2,
1921
})
2022
}

internal/character/clara/eidolon.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ func init() {
1919
modifier.Register(E2, modifier.Config{
2020
Stacking: modifier.Refresh,
2121
StatusType: model.StatusType_STATUS_BUFF,
22+
CanDispel: true,
2223
})
2324

2425
modifier.Register(E4Buff, modifier.Config{
2526
TickMoment: modifier.ModifierPhase1End,
2627
StatusType: model.StatusType_STATUS_BUFF,
28+
CanDispel: true,
2729
})
2830

2931
modifier.Register(E4, modifier.Config{

internal/character/clara/technique.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const (
1515
func init() {
1616
modifier.Register(Technique, modifier.Config{
1717
StatusType: model.StatusType_STATUS_BUFF,
18+
CanDispel: true,
1819
Duration: 2,
1920
})
2021
}

internal/character/clara/ult.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ func init() {
1818
BehaviorFlags: []model.BehaviorFlag{model.BehaviorFlag_STAT_BURST},
1919
Stacking: modifier.Refresh,
2020
StatusType: model.StatusType_STATUS_BUFF,
21+
CanDispel: true,
2122
Duration: 2,
2223
})
2324

internal/character/danheng/skill.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ func init() {
1919
modifier.Register(SkillSpeedDown, modifier.Config{
2020
Stacking: modifier.ReplaceBySource,
2121
StatusType: model.StatusType_STATUS_DEBUFF,
22+
CanDispel: true,
2223
BehaviorFlags: []model.BehaviorFlag{model.BehaviorFlag_STAT_SPEED_DOWN},
2324
})
2425

0 commit comments

Comments
 (0)