cardsim/errors.go

@@ -55,9 +55,6 @@ func Warningf(f string, args ...any) *Warning {
 // IsSeriousError returns whether e is a non-warning error. If e is nil, this
 // returns false.
 func IsSeriousError(e error) bool {
-	if e == nil {
-		return false
-	}
 	return !errors.Is(e, AnyWarning)
 }
 

cardsim/player.go

@@ -463,20 +463,3 @@ func (p *Player[C]) ReportError(e error) {
 func (p *Player[C]) CanAct() bool {
 	return p.ActionsRemaining > 0 && (len(p.Hand) > 0 || len(p.PermanentActions) > 0)
 }
-
-// Debug adds a message to the player's temporary messages if their debug level
-// is at least the level specified.
-func (p *Player[C]) Debug(minLevel int, msg Message) {
-	if p.DebugLevel < minLevel || msg == nil {
-		return
-	}
-	p.TemporaryMessages = append(p.TemporaryMessages, msg)
-}
-
-// Emit adds a message to the player's temporary messages.
-func (p *Player[C]) Emit(msg Message) {
-	if msg == nil {
-		return
-	}
-	p.TemporaryMessages = append(p.TemporaryMessages, msg)
-}

cardsim/rules.go

@@ -141,7 +141,7 @@ func (r *RuleCollection[C]) performInsert(k *keyedRule[C]) {
 	r.rules[k.id] = k
 
 	s := r.byStep[k.Step()]
-	if len(s) == 0 {
+	if s == nil {
 		r.steps = nil
 	}
 	s = append(s, k.id)
@@ -326,7 +326,7 @@ func (r *RuleCollection[C]) Run(p *Player[C]) error {
 	steps := r.steps
 	if steps == nil {
 		// Step set changed, recalculate.
-		steps = make([]int, 0, len(r.byStep))
+		steps := make([]int, 0, len(r.byStep))
 		for step := range r.byStep {
 			steps = append(steps, step)
 		}
@@ -334,21 +334,18 @@ func (r *RuleCollection[C]) Run(p *Player[C]) error {
 		r.steps = steps
 	}
 
-	p.Debug(2, Msgf("Executing steps: %v", steps))
-
 	var errs ErrorCollector
 	for _, step := range steps {
 		stepRules := r.byStep[step]
-		p.Debug(3, Msgf("Executing step %d; length %d", step, len(stepRules)))
-		ShuffleAll(stepRules, p.Rand)
+		p.Rand.Shuffle(len(stepRules), func(i, j int) {
+			stepRules[i], stepRules[j] = stepRules[j], stepRules[i]
+		})
 		var remove []RuleID
 		halt := false
 		for _, id := range stepRules {
 			rule := r.rules[id]
-			p.Debug(4, Msgf("Executing rule %x (labeled %q)", id, rule.Label()))
 			err := rule.Enact(p)
 			if err != nil {
-				p.Debug(2, Msgf("Rule %x (%q): error: %v", id, rule.Label(), err))
 				ignore := false
 				if errors.Is(err, ErrDeleteRule) {
 					remove = append(remove, id)
@@ -380,14 +377,10 @@ func (r *RuleCollection[C]) Run(p *Player[C]) error {
 			}
 		}
 		if halt {
-			ret := errs.Emit()
-			p.Debug(2, Msgf("Rules stopping early. Result: %v", ret))
-			return ret
+			return errs.Emit()
 		}
 	}
-	ret := errs.Emit()
-	p.Debug(2, Msgf("Rules complete. Result: %v", ret))
-	return ret
+	return errs.Emit()
 }
 
 func (r *RuleCollection[C]) applyDelayedUpdates() {

cardsim/terminalui.go

@@ -8,14 +8,13 @@ import (
 )
 
 func RunSimpleTerminalUI[C StatsCollection](p *Player[C]) error {
-
+	for {
 		err := p.StartNextTurn()
 		if p.DebugLevel < 1 && IsSeriousError(err) {
 			return err
 		}
 		p.ReportError(err)
 
-	for {
 		for p.CanAct() {
 			isCard, cardIdx, choiceIdx, err := pickNextAction(p)
 			p.ReportError(err)
@@ -136,7 +135,7 @@ func pickNextAction[C StatsCollection](p *Player[C]) (isCard bool, cardIdx int,
 				cls()
 				displayOnePanel(p, p.InfoPanels[i-1])
 				wait()
-			} else if i <= handOffset {
+			} else if i < handOffset {
 				i = i - actionsOffset - 1
 				option, promptErr := promptCard(p, p.PermanentActions[i])
 				if option >= 0 || IsSeriousError(promptErr) {
@@ -144,7 +143,7 @@ func pickNextAction[C StatsCollection](p *Player[C]) (isCard bool, cardIdx int,
 				}
 			} else {
 				i = i - handOffset - 1
-				option, promptErr := promptCard(p, p.Hand[i])
+				option, promptErr := promptCard(p, p.Hand[i-handOffset-1])
 				if option >= 0 || IsSeriousError(promptErr) {
 					return true, i, option, nil
 				}
@@ -266,7 +265,7 @@ func promptCard[C StatsCollection](p *Player[C], card Card[C]) (optionIdx int, e
 		}
 		fmt.Println()
 		if valid {
-			fmt.Printf("Go (B)ack, (Q)uit, or enact a choice (1 - %d)? > ", len(opts))
+			fmt.Printf("Go (B)ack, (Q)uit, or enact a choice (1 - %d)? > ", len(opts)+1)
 		} else {
 			fmt.Print("Go (B)ack or (Q)uit? > ")
 		}
@@ -375,7 +374,6 @@ func statsMode[C StatsCollection](p *Player[C]) error {
 			} else if v <= 0 || v > n {
 				fmt.Println("There's no info panel with that index.")
 			} else {
-				cls()
 				err := displayOnePanel(p, p.InfoPanels[v-1])
 				errs.Add(err)
 				if IsSeriousError(err) {
@@ -509,7 +507,7 @@ func review[C StatsCollection](p *Player[C]) error {
 				cls()
 				displayOnePanel(p, p.InfoPanels[i-1])
 				wait()
-			} else if i <= handOffset {
+			} else if i < handOffset {
 				i = i - actionsOffset - 1
 				_, _, err := displayCard(p, p.PermanentActions[i], false)
 				errs.Add(err)

go.mod

@@ -1,9 +1,3 @@
 module cardSimEngine
 
 go 1.20
-
-require (
-	github.com/kr/pretty v0.3.1 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.9.0 // indirect
-)

go.sum

@@ -1,8 +0,0 @@
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=

smoketest/collection.go

@@ -7,7 +7,7 @@ import (
 // SmokeTestCollection is a stats collection for the simple test sim.
 type SmokeTestCollection struct {
 	Number cardsim.Stored[int]
-	Total  cardsim.Stored[int64]
+	Total  cardsim.Stored[int]
 	Turns  cardsim.Invisible[int]
 
 	Flavor cardsim.Stored[string]

smoketest/main.go

@@ -4,8 +4,6 @@ package main
 import (
 	"cardSimEngine/cardsim"
 	"fmt"
-
-	"github.com/kr/pretty"
 )
 
 func main() {
@@ -40,7 +38,6 @@ func main() {
 			Name:  cardsim.MsgStr("Stats"),
 			Intro: cardsim.MsgStr("Hi! These are the smoke test stats."),
 		},
-		ruledumper{},
 	}
 	p.Prompt = prompt{}
 	p.DebugLevel = 5
@@ -57,22 +54,9 @@ func main() {
 type prompt struct{}
 
 func (prompt) Title(p *cardsim.Player[*SmokeTestCollection]) cardsim.Message {
-	return cardsim.MsgStr("Smoke Test")
+	return cardsim.MsgStr("Prompt title -- should not be visible?")
 }
 
 func (prompt) Info(p *cardsim.Player[*SmokeTestCollection]) ([]cardsim.Message, error) {
-	return []cardsim.Message{
-		cardsim.MsgStr("Here, have some stuff."),
-		cardsim.Msgf("It's turn %d according to the player and turn %d according to me.", p.TurnNumber, p.Stats.Turns.Value),
-	}, nil
-}
-
-type ruledumper struct{}
-
-func (ruledumper) Title(p *player) cardsim.Message {
-	return cardsim.MsgStr("Rule Dumper")
-}
-
-func (ruledumper) Info(p *player) ([]cardsim.Message, error) {
-	return []cardsim.Message{cardsim.Msgf("%# v", pretty.Formatter(p.Rules))}, nil
+	return []cardsim.Message{cardsim.MsgStr("Here, have some stuff.")}, nil
 }