src

commit 1c5c6b60eec20071c3c250dfea92ed97e8bfec34
parent dc4abee56e21a9f91a9b6d14d18308170ea6abda
Author: dwrz <dwrz@dwrz.net>
Date:   Mon, 26 Dec 2022 17:13:55 +0000

Refactor minotaur automatic size

Diffstat:
M
cmd/minotaur/main.go
 | 
20
++++++++++++++++----
M
pkg/minotaur/minotaur.go
 | 
13
+++++++++++++

2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/cmd/minotaur/main.go b/cmd/minotaur/main.go
@@ -15,8 +15,8 @@ import (
 )
 
 var (
-	height = flag.Int("h", 2, "height")
-	width  = flag.Int("w", 2, "width")
+	height = flag.Int("h", 0, "height")
+	width  = flag.Int("w", 0, "width")
 	tick   = flag.Int("t", 250, "ms between minotaur movement")
 )
 
@@ -25,10 +25,10 @@ func main() {
 
 	// Parse flags.
 	flag.Parse()
-	if *height <= 0 {
+	if *height < 0 {
 		l.Error.Fatalf("invalid height: %d", *height)
 	}
-	if *width <= 0 {
+	if *width < 0 {
 		l.Error.Fatalf("invalid width: %d", *width)
 	}
 	if *tick <= 0 {
@@ -62,6 +62,18 @@ func main() {
 	if err != nil {
 		l.Error.Fatalf("failed to get terminal attributes: %v", err)
 	}
+	size, err := t.Size()
+	if err != nil {
+		l.Error.Fatalf("failed to get terminal size: %v", err)
+	}
+	if *height == 0 {
+		rows := int(size.Rows)
+		height = &rows
+	}
+	if *width == 0 {
+		cols := int(size.Columns) + 1
+		width = &cols
+	}
 
 	// TODO: refactor; handle sigwinch.
 	go func() {
diff --git a/pkg/minotaur/minotaur.go b/pkg/minotaur/minotaur.go
@@ -58,6 +58,19 @@ type Parameters struct {
 }
 
 func New(p Parameters) (*Game, error) {
+	// Account for two spaces per cell; horizontal passages and walls.
+	// Account an extra row for the right wall.
+	if p.Width%4 == 0 {
+		p.Width -= 1
+	}
+	p.Width /= 4
+
+	// Account extra rows for vertical passages and walls.
+	if p.Height%2 == 0 {
+		p.Height -= 1
+	}
+	p.Height /= 2
+
 	var g = &Game{
 		errs:     make(chan error),
 		events:   make(chan *input.Event),