STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2341 from alissonbrunosa/clean-garden-statusline

Browse source 
Reset Garden statusline completely when moving around
This commit is contained in:
Nate Smith 2020-11-02 11:33:05 -06:00 • committed by GitHub
commit 20e33f0147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
pkg/cmd/repo/garden/garden.go
View file

@ -303,7 +303,7 @@ func gardenRun(opts *GardenOptions) error {
}
// status line stuff
sl := statusLine(garden, player)
sl := statusLine(garden, player, opts.IO)
fmt.Fprint(out, "\033[;H") // move to top left
for y := 0; y < player.Geo.Height-1; y++ {
@ -450,17 +450,26 @@ func drawGarden(out io.Writer, garden [][]*Cell, player *Player) {
fmt.Fprintln(out, utils.Bold(sl))
}
func statusLine(garden [][]*Cell, player *Player) string {
statusLine := garden[player.Y][player.X].StatusLine + " "
func statusLine(garden [][]*Cell, player *Player, io *iostreams.IOStreams) string {
width := io.TerminalWidth()
statusLines := []string{garden[player.Y][player.X].StatusLine}
if player.ShoeMoistureContent > 1 {
statusLine += "\nYour shoes squish with water from the stream."
statusLines = append(statusLines, "Your shoes squish with water from the stream.")
} else if player.ShoeMoistureContent == 1 {
statusLine += "\nYour shoes seem to have dried out."
statusLines = append(statusLines, "Your shoes seem to have dried out.")
} else {
statusLine += "\n "
statusLines = append(statusLines, "")
}
return statusLine
for i, line := range statusLines {
if len(line) < width {
paddingSize := width - len(line)
statusLines[i] = line + strings.Repeat(" ", paddingSize)
}
}
return strings.Join(statusLines, "\n")
}
func shaToColorFunc(sha string) func(string) string {