thefish/alchemyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

old connections working

Browse Source
This commit is contained in:
thefish 2019-11-11 02:29:01 +03:00
parent 931971ba8f
commit ef2577741f
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
engine/gamemap/mapgens/default.go
View File

@ -82,26 +82,33 @@ func DefaultGen(l *gamemap.Level) (*gamemap.Level, []*gamemap.Room) {
//itemize(rooms) //itemize(rooms)
} }
//build delannay graph from room center
//refine it to minimum spanning tree
//connect accordingly
for idx, room := range rooms { for idx, room := range rooms {
if idx > 0 { if idx > 0 {
connectRooms(l, room, rooms[idx-1], fillage, rng.Range(0, 1)) connectRooms(l, room, rooms[idx-1], rng.Range(0, 1))
} }
} }
return l, rooms return l, rooms
} }
func connectRooms(l *gamemap.Level, room, otherRoom *gamemap.Room, fillage types.RectFill, toss int) { func connectRooms(l *gamemap.Level, room, otherRoom *gamemap.Room, toss int) {
if toss == 0 { if toss == 0 {
digHTunnel(l, room.Center.X, otherRoom.Center.X, room.Center.Y, fillage) digHTunnel(l, room.Center.X, otherRoom.Center.X, room.Center.Y)
digVTunnel(l, room.Center.Y, otherRoom.Center.Y, otherRoom.Center.X, fillage) digVTunnel(l, room.Center.Y, otherRoom.Center.Y, otherRoom.Center.X)
} else { } else {
digVTunnel(l, room.Center.Y, otherRoom.Center.Y, room.Center.Y, fillage) digVTunnel(l, room.Center.Y, otherRoom.Center.Y, room.Center.Y)
digHTunnel(l, room.Center.X, otherRoom.Center.X, otherRoom.Center.Y, fillage) digHTunnel(l, room.Center.X, otherRoom.Center.X, otherRoom.Center.Y)
} }
} }
func digHTunnel(l *gamemap.Level, x1, x2, y int, fillage types.RectFill) { func digHTunnel(l *gamemap.Level, x1, x2, y int) {
var start, finish int var start, finish int
if x1 < x2 { if x1 < x2 {
start = x1 start = x1
@ -112,13 +119,13 @@ func digHTunnel(l *gamemap.Level, x1, x2, y int, fillage types.RectFill) {
} }
for i := start; i <= finish; i++ { for i := start; i <= finish; i++ {
if l.InBounds(types.Coords{i, y}) { if l.InBounds(types.Coords{i, y}) {
l.SetTileByXY(i, y, fillage.Body.(func() *gamemap.Tile)()) l.SetTileByXY(i, y, gamemap.NewFloor())
//l.Tiles[i][y] = gamemap.NewFloor() //l.Tiles[i][y] = gamemap.NewFloor()
} }
} }
} }
func digVTunnel(l *gamemap.Level, y1, y2, x int, fillage types.RectFill) { func digVTunnel(l *gamemap.Level, y1, y2, x int) {
var start, finish int var start, finish int
if y1 < y2 { if y1 < y2 {
start = y1 start = y1
@ -129,7 +136,7 @@ func digVTunnel(l *gamemap.Level, y1, y2, x int, fillage types.RectFill) {
} }
for i := start; i <= finish; i++ { for i := start; i <= finish; i++ {
if l.InBounds(types.Coords{x, i}) { if l.InBounds(types.Coords{x, i}) {
l.SetTileByXY(x, i, fillage.Body.(func() *gamemap.Tile)()) l.SetTileByXY(x, i, gamemap.NewFloor())
} }
} }
} }

6
engine/gamemap/room.go
View File

@ -44,7 +44,7 @@ func (room *Room) BlitToLevel(l *Level, where types.Coords) error {
continue continue
} }
//check underlying tile //check underlying tile
if underlyingTile != nil || if underlyingTile == nil ||
underlyingTile.Name != "Wall" { underlyingTile.Name != "Wall" {
return invalidBlit return invalidBlit
} }
@ -54,6 +54,9 @@ func (room *Room) BlitToLevel(l *Level, where types.Coords) error {
//update room coords? //update room coords?
room.X = where.X room.X = where.X
room.Y = where.Y room.Y = where.Y
//update centers!
room.Center.X += where.X
room.Center.Y += where.Y
//update connector? //update connector?
for i, _ := range room.Connectors { for i, _ := range room.Connectors {
room.Connectors[i].X += where.X room.Connectors[i].X += where.X
@ -71,6 +74,7 @@ func NewRandomRectRoom(rng *util.RNG, w, h int, fillage types.RectFill) *Room {
h, h,
), ),
Center: types.Coords{w / 2, h /2 }, Center: types.Coords{w / 2, h /2 },
Geometry: make([]func()*Tile, w*h),
} }
newRoom.Blit(fillage, newRoom) newRoom.Blit(fillage, newRoom)
//add connectors //add connectors

2
engine/gamemap/tile.go
View File

@ -39,7 +39,7 @@ func NewWall() *Tile {
return &Tile{ return &Tile{
Name: "Wall", Name: "Wall",
Description: "A dull rock wall", Description: "A dull rock wall",
BlocksPass: true, BlocksPass: false,
BlocksSight: true, BlocksSight: true,
Explored: false, Explored: false,
MustDraw: false, MustDraw: false,

2
go.mod
View File

@ -10,7 +10,7 @@ require (
github.com/rs/zerolog v1.15.0 github.com/rs/zerolog v1.15.0
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136 // indirect golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136 // indirect
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect
golang.org/x/tools v0.0.0-20191109212701-97ad0ed33101 // indirect golang.org/x/tools v0.0.0-20191109212701-97ad0ed33101
gonum.org/v1/gonum v0.6.0 // indirect gonum.org/v1/gonum v0.6.0 // indirect
lab.zaar.be/thefish/bearlibterminal v0.0.0-20191018101635-dd37bbc90d77 lab.zaar.be/thefish/bearlibterminal v0.0.0-20191018101635-dd37bbc90d77
) )