Decompose score and wakeMonster (refactor step 7)

score splits into scoreInsert/scoreLines/showScores; wakeMonster gains
meanWakes/medusaCatches/medusaGaze predicates and effect. Behavior and
RNG call order unchanged.

game/score.go

@@ -107,61 +107,81 @@ func (g *RogueGame) score(amount, flags int, monst byte) {
 	topTen := g.rdScore()
 	// Insert her in list if need be
 	ins := -1
-
 	if !g.NoScore && flags >= 0 {
-		uid := os.Getuid()
+		ins = g.scoreInsert(topTen, amount, flags, monst)
+	}
 
-		scp := len(topTen)
-		for i := range topTen {
-			if amount > topTen[i].Score {
-				scp = i
+	lines, highlight := g.scoreLines(topTen, ins)
+	g.showScores(lines, highlight)
 
-				break
-			} else if !g.AllScore && flags != 2 &&
-				topTen[i].UID == uid && topTen[i].Flags != 2 {
-				// only one score per nowin uid
-				scp = len(topTen)
+	// Update the list file
+	if ins >= 0 {
+		g.wrScore(topTen)
+	}
+}
 
-				break
-			}
-		}
+// scoreInsert slots the new score into the top ten, honoring the
+// one-score-per-losing-uid rule; -1 means it did not place (the
+// insertion half of rip.c score).
+func (g *RogueGame) scoreInsert(topTen []ScoreEnt, amount, flags int, monst byte) int {
+	uid := os.Getuid()
 
-		if scp < len(topTen) {
-			sc2 := len(topTen) - 1
-			if flags != 2 && !g.AllScore {
-				for i := scp; i < len(topTen); i++ {
-					if topTen[i].UID == uid && topTen[i].Flags != 2 {
-						sc2 = i
+	scp := len(topTen)
+	for i := range topTen {
+		if amount > topTen[i].Score {
+			scp = i
 
-						break
-					}
-				}
-			}
+			break
+		} else if !g.AllScore && flags != 2 &&
+			topTen[i].UID == uid && topTen[i].Flags != 2 {
+			// only one score per nowin uid
+			scp = len(topTen)
 
-			for sc2 > scp {
-				topTen[sc2] = topTen[sc2-1]
-				sc2--
-			}
-
-			lvl := g.Depth
-			if flags == 2 {
-				lvl = g.MaxDepth
-			}
-
-			topTen[scp] = ScoreEnt{
-				UID:     uid,
-				Score:   amount,
-				Flags:   flags,
-				Monster: monst,
-				Name:    g.Whoami,
-				Level:   lvl,
-				Time:    time.Now().Unix(),
-			}
-			ins = scp
+			break
 		}
 	}
 
-	// Build the list display
+	if scp >= len(topTen) {
+		return -1
+	}
+
+	sc2 := len(topTen) - 1
+	if flags != 2 && !g.AllScore {
+		for i := scp; i < len(topTen); i++ {
+			if topTen[i].UID == uid && topTen[i].Flags != 2 {
+				sc2 = i
+
+				break
+			}
+		}
+	}
+
+	for sc2 > scp {
+		topTen[sc2] = topTen[sc2-1]
+		sc2--
+	}
+
+	lvl := g.Depth
+	if flags == 2 {
+		lvl = g.MaxDepth
+	}
+
+	topTen[scp] = ScoreEnt{
+		UID:     uid,
+		Score:   amount,
+		Flags:   flags,
+		Monster: monst,
+		Name:    g.Whoami,
+		Level:   lvl,
+		Time:    time.Now().Unix(),
+	}
+
+	return scp
+}
+
+// scoreLines formats the scoreboard, noting which display line holds
+// the freshly inserted score (the display half of rip.c score).
+func (g *RogueGame) scoreLines(topTen []ScoreEnt, ins int) ([]string, int) {
 	label := "Rogueists"
 	if g.AllScore {
 		label = "Scores"
@@ -194,32 +214,35 @@ func (g *RogueGame) score(amount, flags int, monst byte) {
 		lines = append(lines, line)
 	}
 
-	if g.scr != nil && g.scr.term != nil {
-		g.clear()
+	return lines, highlight
+}
 
-		for i, line := range lines {
-			if i == highlight {
-				g.standout()
-			}
-
-			g.mvaddstr(i, 0, line)
-
-			if i == highlight {
-				g.standend()
-			}
-		}
-
-		g.refresh()
-	} else {
+// showScores prints the scoreboard on the screen when there is one,
+// else to standard output (rip.c score).
+func (g *RogueGame) showScores(lines []string, highlight int) {
+	if g.scr == nil || g.scr.term == nil {
 		for _, line := range lines {
 			_, _ = fmt.Fprintln(os.Stdout, line) // CLI output
 		}
+
+		return
 	}
 
-	// Update the list file
-	if ins >= 0 {
-		g.wrScore(topTen)
+	g.clear()
+
+	for i, line := range lines {
+		if i == highlight {
+			g.standout()
+		}
+
+		g.mvaddstr(i, 0, line)
+
+		if i == highlight {
+			g.standend()
+		}
 	}
+
+	g.refresh()
 }
 
 // ShowScores implements the -s command line option: print the scoreboard