From 874c492e5c471d4ee9bde1638dc675999b8b1f51 Mon Sep 17 00:00:00 2001 From: citrons Date: Sat, 1 Feb 2025 14:19:23 -0600 Subject: renaming/refactoring --- football/main.go | 62 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'football/main.go') diff --git a/football/main.go b/football/main.go index f6332c1..a8d0126 100644 --- a/football/main.go +++ b/football/main.go @@ -116,38 +116,38 @@ func main() { tui.Clear() drawFootball(balls[:]) - tui.Write(1, 9, " DIALOG:", tui.Style {Fg: tui.Red, Bold: true}) - tui.Write(1, 10, " ", tui.DefaultStyle) - w := tui.Write(2, 10, sb.String(), tui.DefaultStyle) + tui.WriteAt(1, 9, " DIALOG:", tui.Style {Fg: tui.Red, Bold: true}) + tui.WriteAt(1, 10, " ", tui.DefaultStyle) + w := tui.WriteAt(2, 10, sb.String(), tui.DefaultStyle) tui.MoveCursor(2 + w, 10) - tui.Write(1, 11, " RESPONSE:", tui.Style {Fg: tui.Green, Bold: true}) - tui.Write(1, 12, " ", tui.DefaultStyle) - tui.Write(2, 12, response, tui.DefaultStyle) + tui.WriteAt(1, 11, " RESPONSE:", tui.Style {Fg: tui.Green, Bold: true}) + tui.WriteAt(1, 12, " ", tui.DefaultStyle) + tui.WriteAt(2, 12, response, tui.DefaultStyle) - tui.Write(1, 14, " TIP: click the mouse", tui.Style {Fg: tui.Yellow, Bold: true}) + tui.WriteAt(1, 14, " TIP: click the mouse", tui.Style {Fg: tui.Yellow, Bold: true}) - tui.Write(1, 15, " ", tui.DefaultStyle) - tui.Write(2, 15, lastKey.Name(), tui.DefaultStyle) - tui.Write(11, 15, " ", tui.DefaultStyle) - tui.Write(12, 15, strconv.FormatInt(int64(rune(lastKey)), 16), tui.DefaultStyle) + tui.WriteAt(1, 15, " ", tui.DefaultStyle) + tui.WriteAt(2, 15, lastKey.Name(), tui.DefaultStyle) + tui.WriteAt(11, 15, " ", tui.DefaultStyle) + tui.WriteAt(12, 15, strconv.FormatInt(int64(rune(lastKey)), 16), tui.DefaultStyle) if mouseHeld { - tui.Write(1, 18, " ", tui.DefaultStyle) - tui.Write(2, 18, strconv.Itoa(mouseButton), tui.DefaultStyle) + tui.WriteAt(1, 18, " ", tui.DefaultStyle) + tui.WriteAt(2, 18, strconv.Itoa(mouseButton), tui.DefaultStyle) } - tui.Write(1, 19, " ", tui.DefaultStyle) - tui.Write(2, 19, strconv.Itoa(scrolled), tui.DefaultStyle) + tui.WriteAt(1, 19, " ", tui.DefaultStyle) + tui.WriteAt(2, 19, strconv.Itoa(scrolled), tui.DefaultStyle) s := tui.Size() - tui.Write(s.Width - 26, 1, " ", tui.DefaultStyle) - tui.Write(s.Width - 25, 1, "HOME", tui.Style {Bg: tui.Green, Bold: true}) + tui.WriteAt(s.Width - 26, 1, " ", tui.DefaultStyle) + tui.WriteAt(s.Width - 25, 1, "HOME", tui.Style {Bg: tui.Green, Bold: true}) hs := fmt.Sprintf(" %02d", score.home) - tui.Write(s.Width - 26, 2, hs, tui.Style {Fg: tui.Yellow, Bold: true}) + tui.WriteAt(s.Width - 26, 2, hs, tui.Style {Fg: tui.Yellow, Bold: true}) - tui.Write(s.Width - 16, 1, " ", tui.DefaultStyle) - tui.Write(s.Width - 15, 1, username, tui.Style {Bg: tui.Red, Bold: true}) + tui.WriteAt(s.Width - 16, 1, " ", tui.DefaultStyle) + tui.WriteAt(s.Width - 15, 1, username, tui.Style {Bg: tui.Red, Bold: true}) gs := fmt.Sprintf(" %02d", score.guest) - tui.Write(s.Width - 16, 2, gs, tui.Style {Fg: tui.Yellow, Bold: true}) + tui.WriteAt(s.Width - 16, 2, gs, tui.Style {Fg: tui.Yellow, Bold: true}) if err := tui.Present(); err != nil { log.Fatal(err) @@ -220,24 +220,24 @@ func drawFootball(balls []ball) { for y := 0; y < s.Height; y++ { for x := 0; x < s.Width; x++ { if (x + 66) % 10 == 1 && (y + 2) % 5 == 1 { - tui.Write(x, y, "*", tui.Style {Fg: tui.Green}) + tui.WriteAt(x, y, "*", tui.Style {Fg: tui.Green}) } } } - tui.Write(2, 1, "normal", tui.Style {Fg: tui.Red}) - tui.Write(2, 2, "bold", tui.Style {Fg: tui.Yellow, Bold: true}) - tui.Write(2, 3, "italic", tui.Style {Fg: tui.Green, Italic: true}) - tui.Write(2, 4, "underline", tui.Style {Fg: tui.Blue, Underline: true}) - tui.Write(2, 5, "strikethrough", tui.Style {Fg: tui.Magenta, Strikethrough: true}) - tui.Write(2, 6, "hooray!", tui.Style {Fg: tui.White, Bold: true, Italic: true, Underline: true, Strikethrough: true}) + tui.WriteAt(2, 1, "normal", tui.Style {Fg: tui.Red}) + tui.WriteAt(2, 2, "bold", tui.Style {Fg: tui.Yellow, Bold: true}) + tui.WriteAt(2, 3, "italic", tui.Style {Fg: tui.Green, Italic: true}) + tui.WriteAt(2, 4, "underline", tui.Style {Fg: tui.Blue, Underline: true}) + tui.WriteAt(2, 5, "strikethrough", tui.Style {Fg: tui.Magenta, Strikethrough: true}) + tui.WriteAt(2, 6, "hooray!", tui.Style {Fg: tui.White, Bold: true, Italic: true, Underline: true, Strikethrough: true}) for _, b := range balls { if b.explode > 0 { - tui.Write(b.x, b.y, "💥", tui.DefaultStyle) + tui.WriteAt(b.x, b.y, "💥", tui.DefaultStyle) } else if !b.inGoal { - tui.Write(b.x, b.y, "⚽", tui.DefaultStyle) + tui.WriteAt(b.x, b.y, "⚽", tui.DefaultStyle) } } gx := s.Width / 2 - 1 - tui.Write(gx, 0, "🥅", tui.DefaultStyle) + tui.WriteAt(gx, 0, "🥅", tui.DefaultStyle) } -- cgit v1.2.3