Skip to content

Commit

Permalink
adjust xiangling a4 to not automatically trigger
Browse files Browse the repository at this point in the history
- < 0 means no a4
- default: 0 -> -1
  • Loading branch information
k0l11 committed Sep 15, 2023
1 parent 5cdc47e commit 15d6805
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions internal/characters/xiangling/skill.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ func (c *char) Skill(p map[string]int) action.Info {
// delay in frames from guoba expiry until the a4 chili pepper is picked up
a4Delay, ok := p["a4_delay"]
if !ok {
a4Delay = 0
}
if a4Delay < 0 {
a4Delay = 0
a4Delay = -1
}
if a4Delay > 10*60 {
a4Delay = 10 * 60
Expand All @@ -56,6 +53,9 @@ func (c *char) Skill(p map[string]int) action.Info {
c.AddStatus("xianglingguoba", guoba.Duration, false)
c.Core.Combat.AddGadget(guoba)
// queue up a4 relative to guoba expiry
if a4Delay < 0 {
return
}
c.a4(guoba.Duration + a4Delay)
}, 13)

Expand Down
2 changes: 1 addition & 1 deletion ui/packages/docs/src/components/Params/character_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@
{
"ability": "skill",
"param": "a4_delay",
"desc": "Number of frames until the active character picks up the Chili Pepper (A4) relative to Guoba Expiry. Default 0, minimum 0, maximum 600."
"desc": "Number of frames until the active character picks up the Chili Pepper (A4) relative to Guoba Expiry. A negative value indicates that it is not picked up. Default -1, maximum 600."
}
],
"wanderer": [
Expand Down

0 comments on commit 15d6805

Please sign in to comment.