aboutsummaryrefslogtreecommitdiff
path: root/internal/game/game.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/game/game.go')
-rw-r--r--internal/game/game.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/internal/game/game.go b/internal/game/game.go
index d3bb391..a1b7bbe 100644
--- a/internal/game/game.go
+++ b/internal/game/game.go
@@ -235,7 +235,7 @@ func (g *Game) handleGameCommand(sess *net.Session, input string) {
Timestamp: time.Now(),
})
if !p.OptionBool("queue_silently") {
- sess.WriteLine(fmt.Sprintf("\nYou prepare to %s.", cmd))
+ sess.WriteLine(fmt.Sprintf("You prepare to %s.", cmd))
}
return
}
@@ -254,7 +254,7 @@ func (g *Game) handleGameCommand(sess *net.Session, input string) {
}
g.cancelRest(p.Name)
if !p.OptionBool("queue_silently") {
- sess.WriteLine(fmt.Sprintf("\nYou prepare to %s.", cmd))
+ sess.WriteLine(fmt.Sprintf("You prepare to %s.", cmd))
}
}
@@ -340,7 +340,9 @@ func (g *Game) ProcessQueuedCommands() {
if len(parts) > 0 {
g.executeCommand(qc.Session, parts[0], parts[1:], raw)
}
- isBusy := p.Action != nil || len(p.WalkSequence) > 0 || combat.GetCombat(p.Name) != nil || p.MoveTicks > 0
+ as, hasAction := p.ActionState.(*ActionState)
+ isHiding := hasAction && as.Type == ActionHiding
+ isBusy := p.Action != nil || len(p.WalkSequence) > 0 || combat.GetCombat(p.Name) != nil || p.MoveTicks > 0 || isHiding
_, isResting := g.restTimers[p.Name]
if !isResting && !isBusy && qc.Session.State == net.StateGame {
g.writePrompt(qc.Session)