cardsim/card.go

@@ -5,8 +5,9 @@ package cardsim
 type Card[C StatsCollection] interface {
 	// Title is the short name of the card displayed in the hand
 	// and at the top of the card output. It receives the current
-	// player as an argument.
-	Title(p *Player[C]) Message
+	// player as an argument. If it returns an error that is not
+	// a warning, the game crashes.
+	Title(p *Player[C]) (Message, error)
 
 	// Urgent reports whether the card is considered urgent. If
 	// the player has any urgent cards in hand, they cannot choose to act
@@ -67,8 +68,8 @@ type BasicCard[C StatsCollection] struct {
 }
 
 // Title implements Card.
-func (b *BasicCard[C]) Title(_ *Player[C]) Message {
-	return b.CardTitle
+func (b *BasicCard[C]) Title(_ *Player[C]) (Message, error) {
+	return b.CardTitle, nil
 }
 
 // Urgent implements Card.

cardsim/infopanel.go

@@ -11,7 +11,7 @@ import (
 type InfoPanel[C StatsCollection] interface {
 	// Title returns the title of this InfoPanel, which is also used as the
 	// label presented to the player to access this panel.
-	Title(p *Player[C]) Message
+	Title(p *Player[C]) (Message, error)
 
 	// Info returns the displayable contents of this InfoPanel. A nil Message
 	// in the output is interpreted as a paragraph break.
@@ -44,8 +44,8 @@ func VisibleOrDebug[C StatsCollection](p *Player[C], s Stat) bool {
 }
 
 // Title implements `InfoPanel[C]` by returning b's `Name`.
-func (b *BasicStatsPanel[C]) Title(p *Player[C]) Message {
-	return b.Name
+func (b *BasicStatsPanel[C]) Title(p *Player[C]) (Message, error) {
+	return b.Name, nil
 }
 
 // Info implements `InfoPanel[C]` by dumpiing p.Stats, showing those items for

cardsim/terminalui.go

@@ -27,8 +27,7 @@ func RunSimpleTerminalUI[C StatsCollection](p *Player[C]) error {
 			if p.DebugLevel < 1 && IsSeriousError(err) {
 				return err
 			}
-			display(msg)
-			wait()
+			displayAndWait(msg)
 		}
 
 		review(p)
@@ -44,11 +43,12 @@ func RunSimpleTerminalUI[C StatsCollection](p *Player[C]) error {
 	return nil
 }
 
-func display(m Message) {
+func displayAndWait(m Message) {
 	if m == nil {
 		return
 	}
 	fmt.Println(m.String())
+	wait()
 }
 
 func wait() {
@@ -58,18 +58,13 @@ func wait() {
 }
 
 func pickNextAction[C StatsCollection](p *Player[C]) (isCard bool, cardIdx int, choiceIdx int) {
-	for {
 	cls()
 	needsDivider := displayMessageSection(p)
 	if needsDivider {
 		divider()
 	}
 	displayOnePanel(p, p.Prompt)
-		divider()
 	actionsOffset := displayStatsMenu(p)
-		if actionsOffset > 0 {
-			divider()
-		}
 	handOffset := displayPermanentActionsMenu(p, actionsOffset)
 	max := displayHandMenu(p, handOffset)
 
@@ -106,8 +101,7 @@ func pickNextAction[C StatsCollection](p *Player[C]) (isCard bool, cardIdx int,
 		i -= 1
 		if i < actionsOffset {
 			cls()
-				displayOnePanel(p, p.InfoPanels[i])
-				wait()
+			DisplayOnePanelAndWait(p, i)
 		} else if i < handOffset {
 			cls()
 			i -= actionsOffset
@@ -124,7 +118,7 @@ func pickNextAction[C StatsCollection](p *Player[C]) (isCard bool, cardIdx int,
 			}
 		}
 	}
-	}
+	return pickNextAction(p)
 }
 
 func cls() {
@@ -151,36 +145,23 @@ func confirmQuit() {
 }
 
 func displayOnePanel[C StatsCollection](p *Player[C], panel InfoPanel[C]) error {
-	ts := panel.Title(p).String()
+	var errs ErrorCollector
+	t, err := panel.Title(p)
+	if IsSeriousError(err) {
+		return err
+	}
+	errs.Add(err)
+	ts := t.String()
 	if len(ts) > 0 {
 		fmt.Println(ts)
 		fmt.Println(strings.Repeat("-", len(ts)))
 		fmt.Println()
 	}
 	m, err := panel.Info(p)
+	errs.Add(err)
 	if IsSeriousError(err) {
-		return err
+		return errs.Emit()
 	}
-	display(MultiMessage(m))
-	return err
-}
-
-func displayMessageSection[C StatsCollection](p *Player[C]) bool {
-	if len(p.TemporaryMessages) == 0 {
-		return false
-	}
-	display(MultiMessage(p.TemporaryMessages))
-	return true
-}
-
-func displayStatsMenu[C StatsCollection](p *Player[C]) int {
-	if len(p.InfoPanels) == 0 {
-		return 0
-	}
-	fmt.Println("Info Panels")
-	fmt.Println("-----------")
-	for i, s := range p.InfoPanels {
-		fmt.Printf("[%2d]: %s", i+1, s.Title(p).String())
-	}
-	return len(p.InfoPanels)
+	displayAndWait(MultiMessage(m))
+	return errs.Emit()
 }