diff --git a/01_the_screen/game.go b/01_the_screen/game.go index 403d758..89b85bc 100644 --- a/01_the_screen/game.go +++ b/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 diff --git a/02_mazes_and_enemies/data.go b/02_mazes_and_enemies/data.go index 1b2cc8e..af891ee 100644 --- a/02_mazes_and_enemies/data.go +++ b/02_mazes_and_enemies/data.go @@ -15,7 +15,6 @@ const ( ) type Map [][]rune -type Paths [][]int type Position struct { X int diff --git a/02_mazes_and_enemies/map.go b/02_mazes_and_enemies/map.go index 7a2ff6e..a98a02f 100644 --- a/02_mazes_and_enemies/map.go +++ b/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, '#') +} diff --git a/02_mazes_and_enemies/movement.go b/02_mazes_and_enemies/movement.go index 0b3fb5a..3fee1d0 100644 --- a/02_mazes_and_enemies/movement.go +++ b/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, diff --git a/03_pathing_enemies/map.go b/03_pathing_enemies/map.go index 7a2ff6e..a98a02f 100644 --- a/03_pathing_enemies/map.go +++ b/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, '#') +} diff --git a/03_pathing_enemies/movement.go b/03_pathing_enemies/movement.go index 86c7b04..2501eeb 100644 --- a/03_pathing_enemies/movement.go +++ b/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 +}