cat / puzzletea
clone

fifteen puzzle games for the terminal, with daily puzzles, weekly ladders and xp, built on bubble tea

Style unification, vhs variation, just help :)

Dami committed 3050b76
commit
3050b76796614737fb8073bed919756f799f38fd
parent
cd468a65d38dc0df5a9c36ed44852671816a57da
author
Dami <dami.etoile@gmail.com>
19 files changed, +127 -55
Mhashiwokakero/style.go6+++---
Mjustfile1+
Mlightsout/keys.go2+-
Mlightsout/style.go4++--
Mnonogram/Model.go2+-
Mnonogram/keys.go2+-
Mnonogram/style.go12+++++-----
Msudoku/keys.go4++--
Msudoku/style.go2+-
Mvhs/hashiwokakero.tape5+++--
Avhs/help.tape26++++++++++++++++++++++
Mvhs/lightsout.tape10++++----
Mvhs/menu.tape18+++++++++++++---
Mvhs/nonogram.tape36+++++++++++++++++++++++-------
Mvhs/sudoku.tape25+++++++++++++++------
Mvhs/takuzu.tape10++++----
Mvhs/wordsearch.tape11+++++----
Mwordsearch/keys.go4++--
Mwordsearch/style.go2+-
M hashiwokakero/style.go +3 -3
@@ -79,7 +79,7 @@ var (
7979 Foreground(colorEmptyDot)8080 8181 statusBarStyle = lipgloss.NewStyle().82- Foreground(colorInfoText).82+ Foreground(lipgloss.AdaptiveColor{Light: "244", Dark: "244"}).8383 MarginTop(1)8484 8585 gridBorderStyle = lipgloss.NewStyle().
@@ -280,9 +280,9 @@ func bridgeVView(count int, solved bool) string {
280280 func statusBarView(selected, showFullHelp bool) string {281281 if selected {282282 if showFullHelp {283- return statusBarStyle.Render("arrows/wasd: build bridge enter/space/esc: deselect ctrl+n: menu ctrl+h: help")283+ return statusBarStyle.Render("arrows/wasd: build bridge enter/space/esc: cancel ctrl+n: menu ctrl+h: help")284284 }285- return statusBarStyle.Render("arrows/wasd: build bridge enter/space/esc: deselect")285+ return statusBarStyle.Render("arrows/wasd: build bridge enter/space/esc: cancel")286286 }287287 if showFullHelp {288288 return statusBarStyle.Render("arrows/wasd: move enter/space: select island ctrl+n: menu ctrl+h: help")
M justfile +1 -0
@@ -42,4 +42,5 @@ vhs: build
4242 vhs vhs/takuzu.tape4343 vhs vhs/wordsearch.tape4444 vhs vhs/hashiwokakero.tape45+ vhs vhs/help.tapex4546 vhs vhs/lightsout.tape
M lightsout/keys.go +1 -1
@@ -15,7 +15,7 @@ var DefaultKeyMap = KeyMap{
1515 1616 Toggle: key.NewBinding(1717 key.WithKeys("enter", " "),18- key.WithHelp("space/enter", "Toggle"),18+ key.WithHelp("enter/space", "Toggle"),1919 ),2020 }2121
M lightsout/style.go +2 -2
@@ -83,7 +83,7 @@ func gridView(g [][]bool, c game.Cursor, solved bool) string {
8383 8484 func statusBarView(showFullHelp bool) string {8585 if showFullHelp {86- return statusBarStyle.Render("arrows/wasd: move space/enter: toggle ctrl+n: menu ctrl+h: help")86+ return statusBarStyle.Render("arrows/wasd: move enter/space: toggle ctrl+n: menu ctrl+h: help")8787 }88- return statusBarStyle.Render("space/enter: toggle")88+ return statusBarStyle.Render("enter/space: toggle")8989 }
M nonogram/Model.go +1 -1
@@ -89,7 +89,7 @@ func (m Model) View() string {
8989 r := rowHintView(m.rowHints, maxWidth, m.currentHints.rows)9090 c := colHintView(m.colHints, maxHeight, m.currentHints.cols)9191 spacer := baseStyle.Width(maxWidth).Height(maxHeight).Render("")92- status := nonoStatusBarView(m.showFullHelp)92+ status := statusBarView(m.showFullHelp)9393 9494 s1 := lipgloss.JoinHorizontal(lipgloss.Bottom, spacer, c)9595 s2 := lipgloss.JoinHorizontal(lipgloss.Top, r, g)
M nonogram/keys.go +1 -1
@@ -25,7 +25,7 @@ var DefaultKeyMap = KeyMap{
2525 ),2626 ClearTile: key.NewBinding(2727 key.WithKeys("backspace"),28- key.WithHelp("⌫", "Clear"),28+ key.WithHelp("bkspc", "Clear"),2929 ),3030 }3131
M nonogram/style.go +6 -6
@@ -38,9 +38,9 @@ var (
3838 hintSatisfiedStyle = baseStyle.3939 Foreground(lipgloss.AdaptiveColor{Light: "22", Dark: "149"})4040 41- nonoStatusBarStyle = lipgloss.NewStyle().42- Foreground(lipgloss.AdaptiveColor{Light: "244", Dark: "244"}).43- MarginTop(1)41+ statusBarStyle = lipgloss.NewStyle().42+ Foreground(lipgloss.AdaptiveColor{Light: "244", Dark: "244"}).43+ MarginTop(1)4444 4545 separatorFG = lipgloss.AdaptiveColor{Light: "250", Dark: "240"}4646 )
@@ -257,11 +257,11 @@ func tileView(val rune, isCursor, inCursorRow, inCursorCol, solved bool) string
257257 return s.Width(cellWidth).AlignHorizontal(lipgloss.Center).Render(r)258258 }259259 260-func nonoStatusBarView(showFullHelp bool) string {260+func statusBarView(showFullHelp bool) string {261261 if showFullHelp {262- return nonoStatusBarStyle.Render("arrows/wasd: move z: fill x: mark bkspc: clear ctrl+n: menu ctrl+h: help")262+ return statusBarStyle.Render("arrows/wasd: move z: fill x: mark bkspc: clear ctrl+n: menu ctrl+h: help")263263 }264- return nonoStatusBarStyle.Render("z: fill x: mark bkspc: clear")264+ return statusBarStyle.Render("z: fill x: mark bkspc: clear")265265 }266266 267267 func intSliceEqual(a, b []int) bool {
M sudoku/keys.go +2 -2
@@ -15,11 +15,11 @@ var DefaultKeyMap = KeyMap{
1515 CursorKeyMap: game.DefaultCursorKeyMap,1616 FillValue: key.NewBinding(1717 key.WithKeys("1", "2", "3", "4", "5", "6", "7", "8", "9"),18- key.WithHelp("[1-9]", "Fill Cell"),18+ key.WithHelp("1-9", "Fill"),1919 ),2020 ClearCell: key.NewBinding(2121 key.WithKeys("backspace"),22- key.WithHelp("bkspc", "Clear Cell Contents"),22+ key.WithHelp("bkspc", "Clear"),2323 ),2424 }2525
M sudoku/style.go +1 -1
@@ -51,7 +51,7 @@ var (
5151 BorderBackground(backgroundColor)5252 5353 statusBarStyle = lipgloss.NewStyle().54- Foreground(lipgloss.AdaptiveColor{Light: "137", Dark: "137"}).54+ Foreground(lipgloss.AdaptiveColor{Light: "244", Dark: "244"}).5555 MarginTop(1)5656 5757 sudokuCellWidth = 2
M vhs/hashiwokakero.tape +3 -2
@@ -2,11 +2,12 @@ Output vhs/hashiwokakero.gif
22 33 Set Theme "catppuccin-mocha"44 Set FontSize 145-Set Width 12005+Set Width 80066 Set Height 80077 Set Margin 6088 Set MarginFill "#7A6855"99 Set WindowBar Colorful10+Set BorderRadius 101011 1112 Env COLORTERM "truecolor"1213 Env CLICOLOR_FORCE "1"
@@ -19,7 +20,7 @@ Sleep 2s
1920 Ctrl+L2021 Show2122 22-Type "./puzzletea new hashi easy-7x7"23+Type "./puzzletea new hashi medium-9x9"2324 Sleep 500ms2425 Enter2526 Sleep 2s
A vhs/help.tape +26 -0
@@ -0,0 +1,26 @@
1+Output vhs/menu.gif2+3+Set Theme "Solarized Darcula"4+Set FontSize 145+Set Width 14006+Set Height 8007+Set Margin 328+Set MarginFill "#8B6B4A"9+Set WindowBar RingsRight10+Set BorderRadius 1411+12+13+Env COLORTERM "truecolor"14+Env CLICOLOR_FORCE "1"15+Env CI ""16+17+Hide18+Type "go build -o puzzletea"19+Enter20+Sleep 2s21+Ctrl+L22+Show23+24+Type "./puzzletea -h"25+Enter26+Sleep 5s
M vhs/lightsout.tape +5 -5
@@ -1,9 +1,9 @@
11 Output vhs/lightsout.gif22 3-Set Theme "catppuccin-mocha"4-Set FontSize 145-Set Width 12006-Set Height 8003+Set Theme "GitHub Dark"4+Set FontSize 185+Set Width 8006+Set Height 88077 Set Margin 6088 Set MarginFill "#8A7260"99 Set WindowBar Colorful
@@ -19,7 +19,7 @@ Sleep 2s
1919 Ctrl+L2020 Show2121 22-Type "./puzzletea new lights-out easy"22+Type "./puzzletea new lights-out hard"2323 Sleep 500ms2424 Enter2525 Sleep 2s
M vhs/menu.tape +15 -3
@@ -1,12 +1,14 @@
11 Output vhs/menu.gif22 3-Set Theme "catppuccin-mocha"3+Set Theme "Treehouse"44 Set FontSize 1455 Set Width 120066 Set Height 80077 Set Margin 6088 Set MarginFill "#8B6B4A"9-Set WindowBar Colorful9+Set WindowBar RingsRight10+Set BorderRadius 1411+1012 1113 Env COLORTERM "truecolor"1214 Env CLICOLOR_FORCE "1"
@@ -59,10 +61,20 @@ Down
5961 Sleep 400ms6062 Down6163 Sleep 400ms64+Down65+Sleep 400ms66+Down67+Sleep 400ms68+Down69+Sleep 400ms70+Down71+Down72+Sleep 600ms73+6274 6375 # Go back through menus6476 Escape65-Sleep 500ms77+Sleep 1s6678 Escape6779 Sleep 500ms6880
M vhs/nonogram.tape +28 -8
@@ -1,12 +1,12 @@
11 Output vhs/nonogram.gif22 3-Set Theme "catppuccin-mocha"3+Set Theme "Monokai Pro"44 Set FontSize 145-Set Width 12006-Set Height 8005+Set Width 10006+Set Height 86077 Set Margin 6088 Set MarginFill "#A85C40"9-Set WindowBar Colorful9+Set WindowBar ColorfulRight1010 1111 Env COLORTERM "truecolor"1212 Env CLICOLOR_FORCE "1"
@@ -19,7 +19,7 @@ Sleep 2s
1919 Ctrl+L2020 Show2121 22-Type "./puzzletea new nonogram easy-5x5"22+Type "./puzzletea new nonogram easy-20x20"2323 Sleep 500ms2424 Enter2525 Sleep 2s
@@ -38,6 +38,8 @@ Right
3838 Type "x"3939 Sleep 400ms4040 41+Ctrl+H42+4143 # Move down and left, fill more cells4244 Down4345 Left
@@ -45,21 +47,39 @@ Left
4547 Type "z"4648 Sleep 400ms4749 Down50+Down51+Down52+Right53+Down54+Down55+Down4856 Type "z"4957 Sleep 400ms5058 Right59+Right60+Right61+Down62+Down63+Down64+Right65+Right5166 Type "z"5267 Sleep 400ms5368 Right5469 Type "z"70+Sleep 500ms71+Right72+Type "z"73+Sleep 300ms74+Right75+Type "z"5576 Sleep 400ms5677 5778 # Demonstrate clearing a cell5879 Backspace59-Sleep 400ms80+Sleep 900ms6081 6182 # Refill it6283 Type "z"63-Sleep 400ms6484 65-Sleep 3s85+Sleep 4s
M vhs/sudoku.tape +18 -7
@@ -1,12 +1,14 @@
11 Output vhs/sudoku.gif22 3-Set Theme "catppuccin-mocha"4-Set FontSize 145-Set Width 12006-Set Height 8003+Set Theme "MaterialDarker"4+Set FontSize 165+Set Width 6006+Set Height 68077 Set Margin 6088 Set MarginFill "#6B5B5E"9-Set WindowBar Colorful9+Set WindowBar Rings10+Set BorderRadius 1011+1012 1113 Env COLORTERM "truecolor"1214 Env CLICOLOR_FORCE "1"
@@ -19,7 +21,7 @@ Sleep 2s
1921 Ctrl+L2022 Show2123 22-Type "./puzzletea new sudoku beginner"24+Type "./puzzletea new sudoku Medium"2325 Sleep 500ms2426 Enter2527 Sleep 2s
@@ -45,7 +47,7 @@ Sleep 500ms
4547 Backspace4648 Sleep 500ms4749 Type "8"48-Sleep 500ms50+Sleep 800ms4951 5052 # Navigate around to show highlighting5153 Down
@@ -54,6 +56,15 @@ Down
5456 Sleep 300ms5557 Right5658 Right59+Sleep 500ms60+Down61+Sleep 200ms62+Left63+Sleep 800ms64+Down65+Sleep 600ms66+Up67+Right5768 Sleep 300ms5869 5970 Sleep 3s
M vhs/takuzu.tape +5 -5
@@ -1,12 +1,12 @@
11 Output vhs/takuzu.gif22 33 Set Theme "catppuccin-mocha"4-Set FontSize 144+Set FontSize 1855 Set Width 12006-Set Height 8007-Set Margin 606+Set Height 9407+Set Margin 8088 Set MarginFill "#6E6352"9-Set WindowBar Colorful9+Set WindowBar ColorfulRight1010 1111 Env COLORTERM "truecolor"1212 Env CLICOLOR_FORCE "1"
@@ -19,7 +19,7 @@ Sleep 2s
1919 Ctrl+L2020 Show2121 22-Type "./puzzletea new takuzu easy"22+Type "./puzzletea new takuzu hard"2323 Sleep 500ms2424 Enter2525 Sleep 2s
M vhs/wordsearch.tape +6 -5
@@ -1,12 +1,13 @@
11 Output vhs/wordsearch.gif22 3-Set Theme "catppuccin-mocha"4-Set FontSize 143+Set Theme "Solarized Darcula"4+Set FontSize 1655 Set Width 120066 Set Height 8007-Set Margin 607+Set Margin 4088 Set MarginFill "#9C7A5B"9-Set WindowBar Colorful9+Set WindowBar ColorfulRight10+Set BorderRadius 101011 1112 Env COLORTERM "truecolor"1213 Env CLICOLOR_FORCE "1"
@@ -19,7 +20,7 @@ Sleep 2s
1920 Ctrl+L2021 Show2122 22-Type "./puzzletea new word-search easy-10x10"23+Type "./puzzletea new word-search hard-20x20"2324 Sleep 500ms2425 Enter2526 Sleep 2s
M wordsearch/keys.go +2 -2
@@ -15,11 +15,11 @@ var DefaultKeyMap = KeyMap{
1515 CursorKeyMap: game.DefaultCursorKeyMap,1616 Select: key.NewBinding(1717 key.WithKeys("enter", " "),18- key.WithHelp("enter/space", "select start/end"),18+ key.WithHelp("enter/space", "Select"),1919 ),2020 Cancel: key.NewBinding(2121 key.WithKeys("esc"),22- key.WithHelp("esc", "cancel selection"),22+ key.WithHelp("esc", "Cancel"),2323 ),2424 }2525
M wordsearch/style.go +1 -1
@@ -38,7 +38,7 @@ var (
3838 Foreground(lipgloss.AdaptiveColor{Light: "137", Dark: "137"})3939 4040 statusBarStyle = lipgloss.NewStyle().41- Foreground(lipgloss.AdaptiveColor{Light: "137", Dark: "137"}).41+ Foreground(lipgloss.AdaptiveColor{Light: "244", Dark: "244"}).4242 MarginTop(1)4343 4444 borderFG = lipgloss.AdaptiveColor{Light: "250", Dark: "240"}