upd methods

engine/gamemap/level.go

@@ -17,7 +17,6 @@ type Level struct {
 	Name     string
 	Branch   string
 	Depth    int
-	MaxRooms int
 	Objects  []ecs.Entity
 	Tiles    [][]*Tile
 }
@@ -34,7 +33,6 @@ func NewLevel(ctx util.ClientCtx, branch string, depth int) *Level {
 	l := &Level{
 		Name:     branch + string(depth),
 		Depth:    depth,
-		MaxRooms: maxrooms,
 		Rect: types.NewRect(0,0, mapWidth, mapHeight),
 	}
 

engine/gamemap/mapgens/default.go

@@ -6,9 +6,9 @@ import (
 	"lab.zaar.be/thefish/alchemyst-go/util"
 )
 //fixme move to config
-var maxrooms = 100
 var minRoomSize = 3
 var maxRoomSize = 11
+var maxrooms = 100
 
 func DefaultGen(l *gamemap.Level) *gamemap.Level {
 
@@ -23,7 +23,7 @@ func DefaultGen(l *gamemap.Level) *gamemap.Level {
 
 	rooms := make([]*gamemap.Room, maxrooms)
 
-	for i := 0; i < l.MaxRooms; i++ {
+	for i := 0; i < maxrooms; i++ {
 		newRoom := &gamemap.Room{
 			Rect: types.NewRect(
 				rng.Range(l.X, l.W),
@@ -92,7 +92,6 @@ func digHTunnel(l *gamemap.Level, x1,x2,y int, fillage types.RectFill) {
 	}
 }
 
-
 func digVTunnel(l *gamemap.Level, y1,y2,x int, fillage types.RectFill) {
 	var start, finish int
 	if y1 > y2 {

engine/types/coords.go

@@ -1,5 +1,7 @@
 package types
 
+import "math"
+
 type Coords struct {
 	X, Y int
 }
@@ -7,3 +9,24 @@ type Coords struct {
 func (c *Coords) Get() (int, int) {
 	return c.X, c.Y
 }
+
+func (c *Coords) DistanceTo(o *Coords) float64 {
+	dx := c.X - o.X
+	dy := c.X - o.Y
+	return math.Sqrt(math.Pow(float64(dx), 2) + math.Pow(float64(dy), 2))
+}
+
+func (c *Coords) IsAdjacentTo(o *Coords) bool {
+	var xDiff, yDiff int
+	if c.X > o.X {
+		xDiff = c.X - o.X
+	} else {
+		xDiff = o.X - c.X
+	}
+	if c.Y > o. Y {
+		yDiff = c.Y - o.Y
+	} else {
+		yDiff = o.Y - c.Y
+	}
+	return xDiff < 2 && yDiff < 2
+}