diff options
Diffstat (limited to 'internal/game/cmd_queued.go')
| -rw-r--r-- | internal/game/cmd_queued.go | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/internal/game/cmd_queued.go b/internal/game/cmd_queued.go index 00cf994..325d197 100644 --- a/internal/game/cmd_queued.go +++ b/internal/game/cmd_queued.go @@ -15,8 +15,9 @@ func (g *Game) doQueued(sess *net.Session) { freeCmds := g.queue.PeekFree(p.Name) activeCmd, hasActive := g.queue.PeekActive(p.Name) + consumeCmd, hasConsume := g.queue.PeekConsume(p.Name) - if len(freeCmds) == 0 && !hasActive { + if len(freeCmds) == 0 && !hasActive && !hasConsume { sess.WriteLine("No actions queued.") return } @@ -46,8 +47,20 @@ func (g *Game) doQueued(sess *net.Session) { sess.WriteLine(" " + cmd) } + if consumeCmd != nil { + if len(freeCmds) > 0 || activeCmd != nil { + sess.WriteLine("") + } + cmd := consumeCmd.Command + if consumeCmd.Args != "" { + cmd += " " + consumeCmd.Args + } + sess.WriteLine(" Queued consume action (executes in combat):") + sess.WriteLine(" " + cmd) + } + sess.WriteLine("") - sess.WriteLine(" All queued actions take effect on the next game tick (600ms).") + sess.WriteLine(fmt.Sprintf(" All queued actions take effect on the next game tick (%dms).", g.Ticks.TickLengthMilliseconds())) sess.WriteLine(" Free actions stack. Only the most recent active action survives.") // ActivePositions returns the names in resolution order and the caller's |