removed game speed for being broken and an antifeature anyway. added color support.

1 files changed, 7 insertions, 5 deletions

diff --git a/internal/game/action_burn.go b/internal/game/action_burn.go
index b16ba42..5c19510 100644
--- a/internal/game/action_burn.go
+++ b/internal/game/action_burn.go
@@ -5,6 +5,7 @@ import (
 	"math/rand"
 
 	"thirdcollapse/internal/action"
+	"thirdcollapse/internal/engine"
 	"thirdcollapse/internal/net"
 	"thirdcollapse/internal/object"
 	"thirdcollapse/internal/player"
@@ -146,7 +147,7 @@ func (g *Game) startStoke(sess *net.Session, p *player.Player, itemID string) {
 		Type:       "stoke",
 		TargetID:   itemID,
 		TargetName: logDef.Name,
-		WaitLeft:   g.computeTicks(10),
+		WaitLeft:   engine.ToTicks(10),
 		Data: map[string]any{
 			"item_id":    itemID,
 			"fire_key":   fireKey,
@@ -182,7 +183,7 @@ func (g *Game) advanceBurn(sess *net.Session, p *player.Player) {
 		g.broadcastDrop(p, logDef.Name)
 
 		data["phase"] = 1
-		p.Action.WaitLeft = g.computeTicks(toolSpeed)
+		p.Action.WaitLeft = engine.ToTicks(toolSpeed)
 		return
 	}
 
@@ -196,7 +197,7 @@ func (g *Game) advanceBurn(sess *net.Session, p *player.Player) {
 	if phase == 1 {
 		sess.WriteLine(fmt.Sprintf("You try burning the %s on the ground...", logDef.Name))
 		data["phase"] = 2
-		p.Action.WaitLeft = g.computeTicks(toolSpeed)
+		p.Action.WaitLeft = engine.ToTicks(toolSpeed)
 		return
 	}
 
@@ -240,7 +241,7 @@ func (g *Game) advanceBurn(sess *net.Session, p *player.Player) {
 
 		sess.WriteLine("You can't seem to get a fire going.")
 		data["phase"] = 1
-		p.Action.WaitLeft = g.computeTicks(toolSpeed)
+		p.Action.WaitLeft = engine.ToTicks(toolSpeed)
 	}
 }
 
@@ -293,7 +294,7 @@ func (g *Game) advanceStoke(sess *net.Session, p *player.Player) {
 		return
 	}
 
-	p.Action.WaitLeft = g.computeTicks(10.0)
+	p.Action.WaitLeft = engine.ToTicks(10.0)
 }
 
 func (g *Game) findFireTool(sess *net.Session, p *player.Player) (toolSpeed float64, ok bool) {
@@ -423,6 +424,7 @@ func (g *Game) cancelStokers(roomID int) {
 		if ok && op.Action != nil && op.Action.Type == "stoke" {
 			other.WriteLine("The fire went out!")
 			g.CancelAction(op)
+			g.writePrompt(other)
 		}
 	}
 }