Feature/cure status effects

.dockerignore

@@ -5,3 +5,7 @@ frontend/node_modules
 frontend/dist
 engine/cmd/testparser
 *.log
+scripts/
+older/
+legends/
+gmdocs/

.gitignore

@@ -6,5 +6,8 @@ node_modules/
 frontend/dist/
 frontend/node_modules/
 *.log
-engine/lofp
-VIBECTL.md
+engine/lofp
+VIBECTL.md
+.vscode/
+__debug_bin*
+start.batstart.bat

Dockerfile

@@ -21,6 +21,9 @@ FROM alpine:3.21
 RUN apk add --no-cache ca-certificates
 WORKDIR /app
 
+# Copy original GM HTML pages
+COPY ["original/GM Pages/", "gm-pages/"]
+
 # Copy binary
 COPY --from=backend /lofp .
 

engine/cmd/lofp/main.go

@@ -50,23 +50,24 @@ func main() {
 
 	// Convert to ParsedData
 	parsed := &gameworld.ParsedData{
-		Rooms:        result.Rooms,
-		Items:        result.Items,
-		Monsters:     result.Monsters,
-		Nouns:        result.Nouns,
-		Adjectives:   result.Adjectives,
-		MonsterAdjs:  result.MonsterAdjs,
-		Variables:    result.Variables,
-		Regions:      result.Regions,
+		Rooms:                result.Rooms,
+		Items:                result.Items,
+		Monsters:             result.Monsters,
+		Nouns:                result.Nouns,
+		Adjectives:           result.Adjectives,
+		MonsterAdjs:          result.MonsterAdjs,
+		Variables:            result.Variables,
+		Regions:              result.Regions,
 		MonsterLists:         result.MonsterLists,
 		SeasonalMonsterLists: result.SeasonalMonsterLists,
 		SeasonalRooms:        result.SeasonalRooms,
-		CEvents:      result.CEvents,
-		MoneyDefs:    result.MoneyDefs,
-		ForageDefs:   result.ForageDefs,
-		MineDefs:     result.MineDefs,
-		StartRoom:    result.StartRoom,
-		BumpRoom:     result.BumpRoom,
+		SeasonalForageDefs:   result.SeasonalForageDefs,
+		CEvents:              result.CEvents,
+		MoneyDefs:            result.MoneyDefs,
+		ForageDefs:           result.ForageDefs,
+		MineDefs:             result.MineDefs,
+		StartRoom:            result.StartRoom,
+		BumpRoom:             result.BumpRoom,
 	}
 
 	// Connect to MongoDB (optional — game works without it)

engine/internal/api/api.go

@@ -58,14 +58,14 @@ type ClientConn interface {
 type Session struct {
 	Player       *engine.Player
 	Conn         ClientConn
-	CaptureID    string    // active capture session ID, empty if not recording
-	lastCmdTime  time.Time // rate limiting: last command timestamp
-	cmdCount     int       // rate limiting: commands in current window
+	CaptureID    string      // active capture session ID, empty if not recording
+	lastCmdTime  time.Time   // rate limiting: last command timestamp
+	cmdCount     int         // rate limiting: commands in current window
 	chatTimes    []time.Time // chat flood: timestamps of recent broadcasts
 	cmdTimes     []time.Time // command rate: sliding window for 10/10s limit
-	authFailures int        // auth attempt failures (disconnect after 3)
-	lastActivity time.Time  // idle timeout tracking
-	quitSent     bool       // QUIT already broadcast departure
+	authFailures int         // auth attempt failures (disconnect after 3)
+	lastActivity time.Time   // idle timeout tracking
+	quitSent     bool        // QUIT already broadcast departure
 }
 
 // wsConn wraps a gorilla WebSocket connection to implement ClientConn.
@@ -103,7 +103,6 @@ func (w *wsConn) RemoteAddr() string {
 	return w.conn.RemoteAddr().String()
 }
 
-
 // getClientIP extracts the real client IP from the request, preferring
 // Fly-Client-IP (set by Fly.io proxy), then X-Forwarded-For, then RemoteAddr.
 func getClientIP(r *http.Request) string {
@@ -348,6 +347,18 @@ func (s *Server) setupRoutes() {
 	api.HandleFunc("/admin/characters/deleted", s.handleAdminListDeletedCharacters).Methods("GET")
 	api.HandleFunc("/admin/characters/{firstName}/recover", s.handleAdminRecoverCharacter).Methods("PUT")
 
+	gmPagesDir := "/app/gm-pages"
+
+	if info, err := os.Stat(gmPagesDir); err == nil && info.IsDir() {
+		s.router.PathPrefix("/gm-pages/").Handler(
+			http.StripPrefix(
+				"/gm-pages/",
+				http.FileServer(http.Dir(gmPagesDir)),
+			),
+		)
+
+		log.Printf("Serving GM pages from %s", gmPagesDir)
+	}
 	// Serve static frontend files in production (if /app/static exists)
 	staticDir := os.Getenv("LOFP_STATIC_DIR")
 	if staticDir == "" {
@@ -490,7 +501,9 @@ func (s *Server) handleGameWS(w http.ResponseWriter, r *http.Request) {
 	defer func() {
 		s.connMu.Lock()
 		s.connsByIP[ip]--
-		if s.connsByIP[ip] <= 0 { delete(s.connsByIP, ip) }
+		if s.connsByIP[ip] <= 0 {
+			delete(s.connsByIP, ip)
+		}
 		s.connMu.Unlock()
 	}()
 
@@ -773,7 +786,9 @@ func (s *Server) handleGameWS(w http.ResponseWriter, r *http.Request) {
 			cutoff := now.Add(-10 * time.Second)
 			var recentCmds []time.Time
 			for _, t := range session.cmdTimes {
-				if t.After(cutoff) { recentCmds = append(recentCmds, t) }
+				if t.After(cutoff) {
+					recentCmds = append(recentCmds, t)
+				}
 			}
 			session.cmdTimes = append(recentCmds, now)
 			if len(session.cmdTimes) > 10 {
@@ -787,6 +802,7 @@ func (s *Server) handleGameWS(w http.ResponseWriter, r *http.Request) {
 			ctx := context.Background()
 			playerRoom := session.Player.RoomNumber
 			result := s.engine.ProcessCommand(ctx, session.Player, cmd.Input)
+
 			result.PlayerState = session.Player
 			result.PromptIndicators = session.Player.PromptIndicators()
 			s.sendResult(session, result)
@@ -812,7 +828,9 @@ func (s *Server) handleGameWS(w http.ResponseWriter, r *http.Request) {
 				cutoff := now.Add(-10 * time.Second)
 				var recent []time.Time
 				for _, t := range session.chatTimes {
-					if t.After(cutoff) { recent = append(recent, t) }
+					if t.After(cutoff) {
+						recent = append(recent, t)
+					}
 				}
 				session.chatTimes = recent
 				if len(session.chatTimes) >= 5 {
@@ -932,7 +950,7 @@ func (s *Server) dispatchCommandResult(session *Session, result *engine.CommandR
 			if sess.Player == nil || sess.Player.FirstName == result.TelepathySender {
 				continue
 			}
-			if sess.Player.TelepathyActive {
+			if sess.Player.HasTelepathy() {
 				s.sendBroadcast(sess, telepathyLines)
 			}
 		}

engine/internal/api/ssh.go

@@ -33,24 +33,39 @@ func (s *sshConn) SendResult(result *engine.CommandResult) error {
 
 	var buf strings.Builder
 	if result.RoomName != "" {
-		buf.WriteString(ansiBoldCyan + result.RoomName + ansiReset + "\r\n")
+		buf.WriteString(ansiBoldCyan)
+		buf.WriteString(result.RoomName)
+		buf.WriteString(ansiReset)
+		buf.WriteString("\r\n")
+
 	}
 	if result.RoomDesc != "" {
-		buf.WriteString(wordWrap(result.RoomDesc, s.width) + "\r\n")
+		buf.WriteString(wordWrap(result.RoomDesc, s.width))
+		buf.WriteString("\r\n")
 	}
 	if len(result.Exits) > 0 {
-		buf.WriteString(ansiGreen + "Obvious exits: " + strings.Join(result.Exits, ", ") + ansiReset + "\r\n")
+		buf.WriteString(ansiGreen + "Obvious exits: ")
+		buf.WriteString(strings.Join(result.Exits, ", "))
+		buf.WriteString(ansiReset)
+		buf.WriteString("\r\n")
 	}
 	if len(result.Items) > 0 {
 		for _, item := range result.Items {
-			buf.WriteString(ansiYellow + item + ansiReset + "\r\n")
+			buf.WriteString(ansiYellow)
+			buf.WriteString(item)
+			buf.WriteString(ansiReset)
+			buf.WriteString("\r\n")
 		}
 	}
 	for _, msg := range result.Messages {
-		buf.WriteString(msg + "\r\n")
+		buf.WriteString(msg)
+		buf.WriteString("\r\n")
 	}
 	if result.Error != "" {
-		buf.WriteString(ansiRed + result.Error + ansiReset + "\r\n")
+		buf.WriteString(ansiRed)
+		buf.WriteString(result.Error)
+		buf.WriteString(ansiReset)
+		buf.WriteString("\r\n")
 	}
 	_, err := s.channel.Write([]byte(buf.String()))
 	return err
@@ -63,9 +78,13 @@ func (s *sshConn) SendBroadcast(messages []string) error {
 	var buf strings.Builder
 	for _, msg := range messages {
 		if strings.HasPrefix(msg, "**") {
-			buf.WriteString(ansiBoldWhite + msg + ansiReset + "\r\n")
+			buf.WriteString(ansiBoldWhite)
+			buf.WriteString(msg)
+			buf.WriteString(ansiReset)
+			buf.WriteString("\r\n")
 		} else {
-			buf.WriteString(msg + "\r\n")
+			buf.WriteString(msg)
+			buf.WriteString("\r\n")
 		}
 	}
 	_, err := s.channel.Write([]byte(buf.String()))
@@ -665,8 +684,8 @@ func (s *Server) sshCharacterSelect(sc *sshConn, ctx context.Context, account *a
 
 func (s *Server) sshCreateCharacter(sc *sshConn, ctx context.Context, accountID string) *engine.Player {
 	existing, _ := s.engine.ListPlayersByAccount(ctx, accountID)
-	if len(existing) >= 8 {
-		sc.writeLine(ansiRed + "You can have at most 8 characters." + ansiReset)
+	if len(existing) >= 3 {
+		sc.writeLine(ansiRed + "You can have at most 3 characters." + ansiReset)
 		return nil
 	}
 
@@ -766,6 +785,11 @@ func (s *Server) sshCommandLoop(ctx context.Context, session *Session, sc *sshCo
 		}
 
 		result := s.engine.ProcessCommand(ctx, session.Player, input)
+
+		// Expire timed effects
+		timerMessages := s.engine.UpdatePlayerTimers(session.Player)
+		result.Messages = append(result.Messages, timerMessages...)
+
 		result.PlayerState = session.Player
 		result.PromptIndicators = session.Player.PromptIndicators()
 		s.sendResult(session, result)

engine/internal/api/telnet.go

@@ -28,14 +28,14 @@ const (
 	sbByte   = 250 // sub-negotiation begin
 	seByte   = 240 // sub-negotiation end
 
-	optEcho  = 1  // Echo
-	optSGA   = 3  // Suppress Go-Ahead
-	optTType = 24 // Terminal Type (MTTS)
-	optNAWS  = 31 // Negotiate About Window Size
-	optMSDP  = 69 // MUD Server Data Protocol
-	optMSSP  = 70 // MUD Server Status Protocol
-	optMCCP2 = 86 // MUD Client Compression Protocol v2
-	optMXP   = 91 // MUD eXtension Protocol
+	optEcho  = 1   // Echo
+	optSGA   = 3   // Suppress Go-Ahead
+	optTType = 24  // Terminal Type (MTTS)
+	optNAWS  = 31  // Negotiate About Window Size
+	optMSDP  = 69  // MUD Server Data Protocol
+	optMSSP  = 70  // MUD Server Status Protocol
+	optMCCP2 = 86  // MUD Client Compression Protocol v2
+	optMXP   = 91  // MUD eXtension Protocol
 	optGMCP  = 201 // Generic MUD Communication Protocol
 
 	// MSSP sub-negotiation
@@ -95,7 +95,7 @@ type telnetConn struct {
 	passwordMode bool
 
 	// MCCP2: compressed writer (nil until activated)
-	compWriter   *zlib.Writer
+	compWriter    *zlib.Writer
 	compActivated bool
 
 	// Server reference for MSSP player count
@@ -137,10 +137,14 @@ func (t *telnetConn) SendResult(result *engine.CommandResult) error {
 	// rather than rendering from the individual fields (which would duplicate).
 	for _, msg := range result.Messages {
 		colored := t.colorizeMessage(msg)
-		buf.WriteString(colored + "\r\n")
+		buf.WriteString(colored)
+		buf.WriteString("\r\n")
 	}
 	if result.Error != "" {
-		buf.WriteString(ansiRed + result.Error + ansiReset + "\r\n")
+		buf.WriteString(ansiRed)
+		buf.WriteString(result.Error)
+		buf.WriteString(ansiReset)
+		buf.WriteString("\r\n")
 	}
 
 	_, err := t.write([]byte(buf.String()))
@@ -167,7 +171,11 @@ func (t *telnetConn) colorizeMessage(msg string) string {
 					b.WriteString(", ")
 				}
 				exit = strings.TrimSpace(exit)
-				b.WriteString("<send href=\"" + exit + "\">" + exit + "</send>")
+				b.WriteString("<send href=\"")
+				b.WriteString(exit)
+				b.WriteString("\">")
+				b.WriteString(exit)
+				b.WriteString("</send>")
 			}
 			b.WriteString("." + ansiReset)
 			return b.String()
@@ -190,9 +198,13 @@ func (t *telnetConn) SendBroadcast(messages []string) error {
 	var buf strings.Builder
 	for _, msg := range messages {
 		if strings.HasPrefix(msg, "**") {
-			buf.WriteString(ansiBoldWhite + msg + ansiReset + "\r\n")
+			buf.WriteString(ansiBoldWhite)
+			buf.WriteString(msg)
+			buf.WriteString(ansiReset)
+			buf.WriteString("\r\n")
 		} else {
-			buf.WriteString(msg + "\r\n")
+			buf.WriteString(msg)
+			buf.WriteString("\r\n")
 		}
 	}
 	_, err := t.write([]byte(buf.String()))
@@ -382,13 +394,13 @@ func (t *telnetConn) negotiate() {
 	// We switch to WILL ECHO only for password prompts
 	t.conn.Write([]byte{
 		iacByte, wontByte, optEcho, // Client handles echo (normal)
-		iacByte, willByte, optSGA,  // Suppress go-ahead
-		iacByte, doByte, optNAWS,   // Request terminal size
-		iacByte, willByte, optGMCP,  // Offer GMCP
+		iacByte, willByte, optSGA, // Suppress go-ahead
+		iacByte, doByte, optNAWS, // Request terminal size
+		iacByte, willByte, optGMCP, // Offer GMCP
 		iacByte, willByte, optMCCP2, // Offer MCCP2
-		iacByte, willByte, optMSSP,  // Offer MSSP
-		iacByte, willByte, optMSDP,  // Offer MSDP
-		iacByte, doByte, optMXP,     // Request MXP
+		iacByte, willByte, optMSSP, // Offer MSSP
+		iacByte, willByte, optMSDP, // Offer MSDP
+		iacByte, doByte, optMXP, // Request MXP
 	})
 
 	// Read and respond to client negotiation for up to 2 seconds
@@ -895,7 +907,9 @@ func buildPrompt(p *engine.Player, gmcpEnabled bool) string {
 
 	indicators := p.PromptIndicators()
 	if indicators != "" {
-		b.WriteString(" " + ansiRed + indicators + ansiReset)
+		b.WriteString(" " + ansiRed)
+		b.WriteString(indicators)
+		b.WriteString(ansiReset)
 	}
 
 	b.WriteString("> ")
@@ -1341,8 +1355,8 @@ func (s *Server) telnetCharacterSelect(tc *telnetConn, ctx context.Context, acco
 
 func (s *Server) telnetCreateCharacter(tc *telnetConn, ctx context.Context, accountID string) *engine.Player {
 	existing, _ := s.engine.ListPlayersByAccount(ctx, accountID)
-	if len(existing) >= 8 {
-		tc.writeLine(ansiRed + "You can have at most 8 characters." + ansiReset)
+	if len(existing) >= 3 {
+		tc.writeLine(ansiRed + "You can have at most 3 characters." + ansiReset)
 		return nil
 	}
 
@@ -1491,6 +1505,11 @@ func (s *Server) telnetCommandLoop(ctx context.Context, session *Session, tc *te
 		}
 
 		result := s.engine.ProcessCommand(ctx, session.Player, input)
+
+		// Expire timed effects
+		//timerMessages := s.engine.UpdatePlayerTimers(session.Player)
+		//result.Messages = append(result.Messages, timerMessages...)
+
 		result.PlayerState = session.Player
 		result.PromptIndicators = session.Player.PromptIndicators()
 		s.sendResult(session, result)