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

slight fixes

Browse Source
This commit is contained in:
thefish 2019-11-01 22:01:23 +03:00
parent 17ef52a5cf
commit 8c428838d6
5 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/game/main.go
View File

@ -64,7 +64,7 @@ func main() {
//fixme //fixme
level, rooms := mapgens.DefaultGen(gamemap.NewLevel(mainCtx, "test", 1)) level, rooms := mapgens.DefaultGen(gamemap.NewLevel(mainCtx, "test", 1))
State.Level = level State.Level = level
vp := mainwindow.NewViewPort(40, 0, 60, 47, mw.GetLayer("base")) vp := mainwindow.NewViewPort(30, 0, 70, 47, mw.GetLayer("base"))
screenMgr := types.NewScreenManager(mainCtx) screenMgr := types.NewScreenManager(mainCtx)

2
engine/fov/precomputed_shade/precomputed_shade.go
View File

@ -274,7 +274,7 @@ func (ps *precomputedShade) ComputeFov(level *gamemap.Level, initCoords types.Co
for _, maybeNb := range ps.CellList { for _, maybeNb := range ps.CellList {
if //int(maybeNb.distance) == int(cell.distance-1) && if //int(maybeNb.distance) == int(cell.distance-1) &&
maybeNb.IsAdjacentTo(&cell.Coords) && maybeNb.IsAdjacentTo(&cell.Coords) &&
(maybeNb.X == cell.X || maybeNb.Y == cell.Y) && //(maybeNb.X == cell.X || maybeNb.Y == cell.Y) &&
maybeNb.lit > 0 { //magic constant! maybeNb.lit > 0 { //magic constant!
level.GetTile(cs).Visible = true level.GetTile(cs).Visible = true
level.GetTile(cs).Explored = true level.GetTile(cs).Explored = true

4
engine/gamemap/level.go
View File

@ -7,8 +7,8 @@ import (
) )
//fixme move to config //fixme move to config
var mapWidth = 70 var mapWidth = 150
var mapHeight = 50 var mapHeight = 90
type Level struct { type Level struct {

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

@ -60,20 +60,20 @@ func DefaultGen(l *gamemap.Level) (*gamemap.Level, []*gamemap.Room) {
//addStairs(rooms) //addStairs(rooms)
//itemize(rooms) //itemize(rooms)
} }
fges := map[int]types.RectFill{
1: types.RectFill{
Top: func() *gamemap.Tile { return gamemap.NewWall() },
Bottom: func() *gamemap.Tile { return gamemap.NewWall() },
Left: func() *gamemap.Tile { return gamemap.NewWall() },
Right: func() *gamemap.Tile { return gamemap.NewWall() },
BottomLeft: func() *gamemap.Tile { return gamemap.NewWall() },
BottomRight: func() *gamemap.Tile { return gamemap.NewWall() },
TopLeft: func() *gamemap.Tile { return gamemap.NewWall() },
TopRight: func() *gamemap.Tile { return gamemap.NewWall() },
Body: func() *gamemap.Tile { return gamemap.NewFloor() },
},
//fillage := types.RectFill{ 2: types.RectFill{
// Top: func() *gamemap.Tile {return gamemap.NewWall()},
// Bottom: func() *gamemap.Tile {return gamemap.NewWall()},
// Left: func() *gamemap.Tile {return gamemap.NewWall()},
// Right: func() *gamemap.Tile {return gamemap.NewWall()},
// BottomLeft: func() *gamemap.Tile {return gamemap.NewWall()},
// BottomRight: func() *gamemap.Tile {return gamemap.NewWall()},
// TopLeft: func() *gamemap.Tile {return gamemap.NewWall()},
// TopRight: func() *gamemap.Tile {return gamemap.NewWall()},
// Body: func() *gamemap.Tile {return gamemap.NewFloor()},
//}
fillage := types.RectFill{
Top: func() *gamemap.Tile { return gamemap.NewWaterTile() }, Top: func() *gamemap.Tile { return gamemap.NewWaterTile() },
Bottom: func() *gamemap.Tile { return gamemap.NewWaterTile() }, Bottom: func() *gamemap.Tile { return gamemap.NewWaterTile() },
Left: func() *gamemap.Tile { return gamemap.NewWaterTile() }, Left: func() *gamemap.Tile { return gamemap.NewWaterTile() },
@ -83,10 +83,16 @@ func DefaultGen(l *gamemap.Level) (*gamemap.Level, []*gamemap.Room) {
TopLeft: func() *gamemap.Tile { return gamemap.NewWaterTile() }, TopLeft: func() *gamemap.Tile { return gamemap.NewWaterTile() },
TopRight: func() *gamemap.Tile { return gamemap.NewWaterTile() }, TopRight: func() *gamemap.Tile { return gamemap.NewWaterTile() },
Body: func() *gamemap.Tile { return gamemap.NewDeepWaterTile() }, Body: func() *gamemap.Tile { return gamemap.NewDeepWaterTile() },
},
}
var fillage types.RectFill
for _, room := range rooms {
fillage = fges[rng.GetWeightedEntity(map[int]int{1:10, 2:1})]
room.Blit(fillage, l)
} }
for idx, room := range rooms { for idx, room := range rooms {
room.Blit(fillage, l)
if idx > 0 { if idx > 0 {
connectRooms(l, room, rooms[idx-1], fillage, rng.Range(0,1)) connectRooms(l, room, rooms[idx-1], fillage, rng.Range(0,1))
} }

4
ui/mainwindow/viewport.go
View File

@ -57,10 +57,10 @@ func (vp *ViewPort) Move(state *gamestate.GameState) {
y = 0 y = 0
} }
if x > state.Level.W - vp.W - 1 { if x > state.Level.W - vp.W - 1 {
x = state.Level.W - vp.W - 1 x = state.Level.W - vp.W
} }
if y > state.Level.H-vp.H - 1 { if y > state.Level.H-vp.H - 1 {
y = state.Level.H - vp.H - 1 y = state.Level.H - vp.H
} }
if x != vp.cameraCoords.X || y != vp.cameraCoords.Y { if x != vp.cameraCoords.X || y != vp.cameraCoords.Y {
state.FovRecompute <- struct{}{} state.FovRecompute <- struct{}{}