This commit is contained in:
anton.gurov
2019-11-12 12:48:36 +03:00
parent 1ba189697f
commit c6d3997e6f
6 changed files with 125 additions and 9 deletions

View File

@ -82,3 +82,8 @@ func (l *Level) SetAllInvisible() {
}
}
func (l *Level) SetAllVisible() {
for idx, _ := range l.Tiles {
l.Tiles[idx].Visible = true
}
}

View File

@ -43,8 +43,8 @@ func DefaultGen(ctx util.ClientCtx,l *gamemap.Level) (*gamemap.Level, []*gamemap
rng := util.NewRNG()
//load prefabs
//pfLoader := gamemap.NewPrefabLoader(ctx)
//pfRooms := pfLoader.PrefabRoomsList()
pfLoader := gamemap.NewPrefabLoader(ctx)
pfRooms := pfLoader.PrefabRoomsList()
//fill with walls
@ -61,17 +61,17 @@ func DefaultGen(ctx util.ClientCtx,l *gamemap.Level) (*gamemap.Level, []*gamemap
var fillage types.RectFill
fillage = fges[rng.GetWeightedEntity(map[int]int{1: 10, 2: 1})]
var newRoom *gamemap.Room
//if rng.Range(0, 5) > 3 {
if rng.Range(0, 5) == 1 {
//prefab
newRoom = &pfRooms[0]
} else {
newRoom = gamemap.NewRandomRectRoom(
rng,
rng.Range(minRoomSize, maxRoomSize),
rng.Range(minRoomSize, maxRoomSize),
fillage,
)
//} else {
// prefab
// newRoom = &pfRooms[0]
//}
}
where := types.Coords{
rng.Range(1, l.W -2 - newRoom.W),
rng.Range(1, l.H - 2 - newRoom.H),

View File

@ -81,7 +81,7 @@ func (pfbl PrefabLoader) PrefabRoomsList() []Room {
Geometry: make([]func()*Tile, rawPrefab.Size.X*rawPrefab.Size.Y),
Mobs: make([]mob.Mob, rawPrefab.Size.X*rawPrefab.Size.Y),
Items: make([]items.Carried, rawPrefab.Size.X*rawPrefab.Size.Y),
Connectors: make([]types.Coords, rawPrefab.Size.X*rawPrefab.Size.Y),
Connectors: make([]types.Coords, 0),
}
//make geometry
var f func() *Tile
@ -94,6 +94,9 @@ func (pfbl PrefabLoader) PrefabRoomsList() []Room {
for i:=0; i < room.W; i++ {
ok := false
shortName := currentTileLegend[string(str[i])]
if shortName == "" {
continue
}
if shortName == "any" {
continue
}