Skip to content
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

adjust xiangling a4 to not automatically trigger #1708

Merged
merged 1 commit into from
Sep 17, 2023
Merged

adjust xiangling a4 to not automatically trigger #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions internal/characters/xiangling/skill.go
View file
Open in desktop
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
View file
Open in desktop
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