feat: simplified conversation trees and output won't overwrite prompts now

1 files changed, 4 insertions, 10 deletions

diff --git a/internal/game/act_room.go b/internal/game/act_room.go
index ff7a780..ddca261 100644
--- a/internal/game/act_room.go
+++ b/internal/game/act_room.go
@@ -18,7 +18,6 @@ type enterSeq struct {
 	roomID     int
 	steps      []world.EnterStep
 	wait       int
-	started    bool
 }
 
 // runEnterSteps evaluates a room's on_enter script for the player. Steps whose
@@ -144,18 +143,13 @@ func (g *Game) fireEnterStep(seq *enterSeq, step world.EnterStep) {
 	if step.Message != "" {
 		msg := expandTemplate(step.Message, p.Name, nil)
 		msg = color.ExpandTagsDefault(mode, seqSpec, msg)
-		if !seq.started {
-			seq.sess.WriteLine("\n" + msg)
-			seq.started = true
-		} else {
-			seq.sess.WriteLine(msg)
-		}
+		seq.sess.WriteLine(msg)
 	}
 	if step.Broadcast != "" && g.Hub != nil {
 		msg := expandTemplate(step.Broadcast, p.Name, nil)
 		msg = color.ExpandTagsDefault(mode, broadcastSpec, msg)
 		for _, other := range g.Hub.PlayersInRoom(seq.roomID) {
-			other.WriteLine(g.colorize(other, "broadcast", "\n"+msg))
+			other.WriteLine(g.colorize(other, "broadcast", msg))
 		}
 	}
 	if step.BroadcastGlobal != "" && g.Hub != nil {
@@ -163,7 +157,7 @@ func (g *Game) fireEnterStep(seq *enterSeq, step world.EnterStep) {
 		msg = color.ExpandTagsDefault(mode, broadcastSpec, msg)
 		for _, other := range g.Hub.AllSessions() {
 			if other.Player != nil {
-				other.WriteLine(g.colorize(other, "broadcast", "\n"+msg))
+				other.WriteLine(g.colorize(other, "broadcast", msg))
 			}
 		}
 	}
@@ -264,7 +258,7 @@ func (g *Game) BroadcastRespawns() {
 		msg := strings.ReplaceAll(cfg.RespawnBroadcast, "{name}", name)
 		if g.Hub != nil {
 			for _, sess := range g.Hub.PlayersInRoom(st.RoomID) {
-				sess.WriteLine(g.colorize(sess, "broadcast", fmt.Sprintf("\n%s", msg)))
+				sess.WriteLine(g.colorize(sess, "broadcast", msg))
 			}
 		}
 	}