Accommodate possibility that High Jump may be canceled before NS Transmission blessing is added

Author: jwalk-511

internal/characters/ororon/jump.go

@@ -16,20 +16,26 @@ const jumpNsStatusTag = nightsoul.NightsoulTransmissionStatus
 // Consume stamina.
 // Hold defines when fall action will automatically be called.
 func (c *char) highJump(hold int) (action.Info, error) {
-	if (hold > maxJumpFrames-minCancelFrames) || (hold < 0) {
-		hold = maxJumpFrames - minCancelFrames
+	if (hold > maxJumpFrames-fallCancelFrames) || (hold < 0) {
+		hold = maxJumpFrames - fallCancelFrames
 	}
 
-	jumpDur := minCancelFrames + hold
+	jumpDur := fallCancelFrames + hold
 	c.jmpSrc = c.Core.F
 	src := c.jmpSrc
 	c.Core.Player.SetAirborne(player.AirborneOroron)
 
-	// Jump cannot be cancelled before NS status is added, so no need to check src here.
+	// Don't add NS if jump is cancelled before NS would be added.
 	jumpNsDuration := jumpDur - jumpNsDelay
-	c.QueueCharTask(func() { c.AddStatus(jumpNsStatusTag, jumpNsDuration, true) }, jumpNsDelay)
+	c.QueueCharTask(func() {
+		if src != c.jmpSrc {
+			return
+		}
+		c.AddStatus(jumpNsStatusTag, jumpNsDuration, true)
+	}, jumpNsDelay)
 
-	jumpStamDrainCb := func() {
+	// Consume stamina.
+	c.QueueCharTask(func() {
 		h := c.Core.Player
 		// Apply stamina reduction mods.
 		stamDrain := h.AbilStamCost(c.Index, action.ActionJump, map[string]int{"hold": 1})
@@ -40,28 +46,26 @@ func (c *char) highJump(hold int) (action.Info, error) {
 		// While in high jump, ororon cannot start resuming stamina regen until after landing.
 		h.LastStamUse = *h.F + jumpDur + fallFrames
 		h.Events.Emit(event.OnStamUse, action.ActionJump)
-	}
-	c.QueueCharTask(jumpStamDrainCb, jumpStamDrainDelay)
+	}, jumpStamDrainDelay)
 
 	act := action.Info{
 		Frames:          frames.NewAbilFunc(jumpHoldFrames[0]),
 		AnimationLength: jumpDur + fallFrames,
-		CanQueueAfter:   minCancelFrames, // earliest cancel
+		CanQueueAfter:   plungeCancelFrames, // earliest cancel
 		State:           action.JumpState,
 	}
 
 	// Trigger a fall after max jump duration
-	fallCb := func() {
+	// TODO: Is this hitlag extended? Does this skip if the action is canceled?
+	act.QueueAction(func() {
 		if src != c.jmpSrc {
 			return
 		}
 
 		fallParam := map[string]int{"fall": 1}
 		// Ideally this would inject the action into the queue of actions to take from the config file, rather than calling exec directly
 		c.Core.Player.Exec(action.ActionHighPlunge, c.Base.Key, fallParam)
-	}
-	// TODO: Is this hitlag extended? Does this skip if the action is canceled?
-	act.QueueAction(fallCb, jumpDur)
+	}, jumpDur)
 	// c.QueueCharTask(fallCb, jumpDur)
 	return act, nil
 }

internal/characters/ororon/ororon.go

@@ -24,11 +24,11 @@ const (
 	jumpStamDrainAmt   = 75
 	jumpStamReqAmt     = 1 // TODO: Find real value
 
-	maxJumpFrames    = 162                       // From swap ui gray to glider wings appear
-	minCancelFrames  = superJumpBeginFrames + 18 // From start of jump animation to plunge animation start
-	fallCancelFrames = superJumpBeginFrames + 46 // From From start of jump animation to UI changes from gliding to standard UI
+	maxJumpFrames      = 162                       // From swap ui gray to glider wings appear
+	plungeCancelFrames = superJumpBeginFrames + 18 // From start of jump animation to plunge animation start
+	fallCancelFrames   = superJumpBeginFrames + 46 // From From start of jump animation to UI changes from gliding to standard UI
 
-	fallFrames = superJumpBeginFrames + 43 // From fall animation start to swap icon un-gray.
+	fallFrames = 43 // From fall animation start to swap icon un-gray.
 )
 
 func init() {
@@ -38,7 +38,7 @@ func init() {
 	jumpHoldFrames = make([][]int, 2)
 	// Hold Jump -> X
 	jumpHoldFrames[0] = frames.InitAbilSlice(60 * 10) // set to very high number for most abilities
-	jumpHoldFrames[0][action.ActionHighPlunge] = minCancelFrames
+	jumpHoldFrames[0][action.ActionHighPlunge] = plungeCancelFrames
 	// Fall -> X
 	jumpHoldFrames[1] = frames.InitAbilSlice(fallFrames)
 	jumpHoldFrames[1][action.ActionAttack] = fallFrames + 10

internal/characters/ororon/plunge.go

@@ -17,8 +17,6 @@ func init() {
 }
 
 func (c *char) fall() (action.Info, error) {
-	c.Core.Player.SetAirborne(player.Grounded)
-
 	// Fall cancel can't happen until after high_plunge can happen. Delay all side effects if try to fall cancel too early.
 	delay := fallCancelFrames - (c.Core.F - c.jmpSrc)
 	if delay <= 0 {
@@ -30,6 +28,9 @@ func (c *char) fall() (action.Info, error) {
 			c.Index)
 	}
 
+	// Cleanup high jump.
+	c.Core.Player.SetAirborne(player.Grounded)
+	c.jmpSrc = 0
 	c.QueueCharTask(func() { c.DeleteStatus(jumpNsStatusTag) }, delay)
 	// Allow stam to start regen when landing
 	c.Core.Player.LastStamUse = c.Core.F + jumpHoldFrames[1][action.ActionSwap] + delay
@@ -46,8 +47,10 @@ func (c *char) fall() (action.Info, error) {
 }
 
 func (c *char) HighPlungeAirborneOroron(p map[string]int) (action.Info, error) {
+	// Cleanup high jump.
 	c.Core.Player.SetAirborne(player.Grounded)
 	c.DeleteStatus(jumpNsStatusTag)
+	c.jmpSrc = 0
 
 	// Allow player to resume stam as soon as plunge is initiated
 	c.Core.Player.LastStamUse = c.Core.F