Add back hurt syntax #1700
Merged
Add back hurt syntax #1700
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k0l11
added
kind: enhancement
|
will remove params that were crutches for this not existing |
- fix drain part triggering on non-external drain
- fix drain part triggering if someone other than holder is drained
unleashurgeek
approved these changes
Sep 10, 2023
Comment on lines
+355
to
+377
| ai := combat.AttackInfo{ | ||
| ActorIndex: s.C.Player.Active(), | ||
| Abil: "Hurt", | ||
| AttackTag: attacks.AttackTagNone, | ||
| ICDTag: attacks.ICDTagNone, | ||
| ICDGroup: attacks.ICDGroupDefault, | ||
| StrikeType: attacks.StrikeTypeDefault, | ||
| Durability: 0, | ||
| Element: s.cfg.Hurt.Element, | ||
| FlatDmg: amt, | ||
| } | ||
| ap := combat.NewSingleTargetHit(s.C.Combat.Player().Key()) | ||
| ap.SkipTargets[targets.TargettablePlayer] = false | ||
| ap.SkipTargets[targets.TargettableEnemy] = true | ||
| ap.SkipTargets[targets.TargettableGadget] = true | ||
|
|
||
| s.C.QueueAttack(ai, ap, -1, f) // -1 to avoid snapshot | ||
|
|
||
| s.C.Log.NewEventBuildMsg(glog.LogHurtEvent, -1, "hurt queued (once)"). | ||
| Write("last", s.cfg.Hurt.LastHurt). | ||
| Write("cfg", s.cfg.Hurt). | ||
| Write("amt", amt). | ||
| Write("hurt_frame", s.C.F+f) |
There was a problem hiding this comment.
nit: should move to function since code between every and once is basically the same
Comment on lines
+29
to
+120
| func parseHurtOnce(p *Parser) (parseFn, error) { | ||
| //hurt once interval=300 amount=1,300 element=phys #once at frame 300 | ||
| var err error | ||
| p.res.Hurt.Active = true | ||
| p.res.Hurt.Once = true | ||
|
|
||
| for n := p.next(); n.Typ != itemEOF; n = p.next() { | ||
| switch n.Typ { | ||
| case itemIdentifier: | ||
| switch n.Val { | ||
| case "interval": | ||
| n, err = p.acceptSeqReturnLast(itemAssign, itemNumber) | ||
| if err == nil { | ||
| p.res.Hurt.Start, err = itemNumberToInt(n) | ||
| } | ||
| case "amount": | ||
| err := parseHurtAmount(p) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| case "element": | ||
| err := parseHurtElement(p) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| default: | ||
| return nil, fmt.Errorf("ln%v: unrecognized hurt event specified: %v", n.line, n.Val) | ||
| } | ||
| case itemTerminateLine: | ||
| return parseRows, nil | ||
| default: | ||
| return nil, fmt.Errorf("ln%v: unrecognized token parsing hurt event: %v", n.line, n) | ||
| } | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| return nil, errors.New("unexpected end of line while parsing hurt event") | ||
| } | ||
|
|
||
| func parseHurtEvery(p *Parser) (parseFn, error) { | ||
| //hurt every interval=480,720 amount=1,300 element=phys #randomly 1 to 300 dmg every 480 to 720 frames | ||
| var err error | ||
| p.res.Hurt.Active = true | ||
| p.res.Hurt.Once = false | ||
|
|
||
| for n := p.next(); n.Typ != itemEOF; n = p.next() { | ||
| switch n.Typ { | ||
| case itemIdentifier: | ||
| switch n.Val { | ||
| case "interval": | ||
| n, err = p.acceptSeqReturnLast(itemAssign, itemNumber) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| p.res.Hurt.Start, err = itemNumberToInt(n) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| n, err = p.acceptSeqReturnLast(itemComma, itemNumber) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| p.res.Hurt.End, err = itemNumberToInt(n) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| case "amount": | ||
| err := parseHurtAmount(p) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| case "element": | ||
| err := parseHurtElement(p) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| default: | ||
| return nil, fmt.Errorf("ln%v: unrecognized hurt event specified: %v", n.line, n.Val) | ||
| } | ||
| case itemTerminateLine: | ||
| return parseRows, nil | ||
| default: | ||
| return nil, fmt.Errorf("ln%v: unrecognized token parsing hurt event: %v", n.line, n) | ||
| } | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| return nil, errors.New("unexpected end of line while parsing hurt event") | ||
| } |
There was a problem hiding this comment.
nit: best to not have repeat code and simplify to one function and extend interval support being either a start and end or specific frame regardless of if once or every.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #836
removed params in favor of only proccing via taking dmg: