More diff pretty work.

01_the_screen/game.go

@@ -10,9 +10,7 @@ func NewGame(width int, height int) (*Game) {
   game.Width = width
   game.Height = height
   game.Enemies = make(map[Position]*Enemy)
-
   game.Level = make(Map, height, height)
-
   game.Player = Enemy{20, Position{1,1}, 4}
 
   return &game

02_mazes_and_enemies/data.go

@@ -15,7 +15,6 @@ const (
 )
 
 type Map [][]rune
-type Paths [][]int
 
 type Position struct {
   X int

02_mazes_and_enemies/map.go

@@ -49,10 +49,6 @@ func (game *Game) FillMap(target Map, setting rune) {
   }
 }
 
-func (game *Game) NewMap() {
-  game.FillMap(game.Level, '#')
-}
-
 func (game *Game) Neighbors(near Position) []Position {
   result := make([]Position, 0, 4)
   points := compass(near, 2)
@@ -65,3 +61,7 @@ func (game *Game) Neighbors(near Position) []Position {
 
   return result
 }
+
+func (game *Game) NewMap() {
+  game.FillMap(game.Level, '#')
+}

02_mazes_and_enemies/movement.go

@@ -1,6 +1,5 @@
 package main
 
-
 func (game *Game) MovePlayer(x_delta int, y_delta int) {
   target := Position{
     game.Player.Pos.X + x_delta,

03_pathing_enemies/map.go

@@ -49,10 +49,6 @@ func (game *Game) FillMap(target Map, setting rune) {
   }
 }
 
-func (game *Game) NewMap() {
-  game.FillMap(game.Level, '#')
-}
-
 func (game *Game) Neighbors(near Position) []Position {
   result := make([]Position, 0, 4)
   points := compass(near, 2)
@@ -65,3 +61,7 @@ func (game *Game) Neighbors(near Position) []Position {
 
   return result
 }
+
+func (game *Game) NewMap() {
+  game.FillMap(game.Level, '#')
+}

03_pathing_enemies/movement.go

@@ -1,14 +1,5 @@
 package main
 
-
-func (game *Game) MoveEnemy(from Position, to Position) {
-  enemy, ok := game.Enemies[from]
-  if !ok { dbg.Fatal("no enemy at", from, "wtf") }
-
-  delete(game.Enemies, from)
-  game.Enemies[to] = enemy
-}
-
 func (game *Game) MovePlayer(x_delta int, y_delta int) {
   target := Position{
     game.Player.Pos.X + x_delta,
@@ -19,3 +10,11 @@ func (game *Game) MovePlayer(x_delta int, y_delta int) {
     game.Player.Pos = target
   }
 }
+
+func (game *Game) MoveEnemy(from Position, to Position) {
+  enemy, ok := game.Enemies[from]
+  if !ok { dbg.Fatal("no enemy at", from, "wtf") }
+
+  delete(game.Enemies, from)
+  game.Enemies[to] = enemy
+}