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

slight refactor, gofmt

Browse Source
This commit is contained in:
thefish
2019-10-26 23:32:32 +03:00
parent 32c598f9e0
commit ec9d3d9a73
20 changed files with 303 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
engine/gamemap/tile.go
View File

@ -10,15 +10,15 @@ type ColorHolder struct {
}
type TileColorSet struct {
Fg func() uint32
Bg func() uint32
DarkFg func() uint32
DarkBg func() uint32
Fg func() uint32
Bg func() uint32
DarkFg func() uint32
DarkBg func() uint32
current *ColorHolder
}
type Appearance struct {
Char string
Char string
ColorSet *TileColorSet
}
@ -34,30 +34,29 @@ func colordance(colorValue uint8, minGlow, maxGlow, step int) uint8 {
type Tile struct {
*Appearance
Name string
Name string
Description string
BlocksPass bool
BlocksPass bool
BlocksSight bool
Explored bool
MustDraw bool
Explored bool
MustDraw bool
}
func NewWall() *Tile {
return &Tile{
Name: "Wall",
Name: "Wall",
Description: "A dull rock wall",
BlocksPass: true,
BlocksPass: true,
BlocksSight: true,
Explored: false,
MustDraw: false,
Explored: false,
MustDraw: false,
Appearance: &Appearance{
Char: "#",
ColorSet: &TileColorSet{
Fg: func() uint32 {return blt.ColorFromARGB(255, 130,110,150)},
Bg: func() uint32 {return blt.ColorFromARGB(255, 172,170,173)},
DarkFg: func() uint32 {return blt.ColorFromARGB(255, 20,20,68)},
DarkBg: func() uint32 {return blt.ColorFromARGB(255, 7,7,30)},
Fg: func() uint32 { return blt.ColorFromARGB(255, 130, 110, 150) },
Bg: func() uint32 { return blt.ColorFromARGB(255, 172, 170, 173) },
DarkFg: func() uint32 { return blt.ColorFromARGB(255, 20, 20, 68) },
DarkBg: func() uint32 { return blt.ColorFromARGB(255, 7, 7, 30) },
},
},
}
@ -65,79 +64,78 @@ func NewWall() *Tile {
func NewFloor() *Tile {
return &Tile{
Name: "Floor",
Name: "Floor",
Description: "Dusty rock floor",
BlocksPass: false,
BlocksPass: false,
BlocksSight: false,
Explored: false,
MustDraw: false,
Explored: false,
MustDraw: false,
Appearance: &Appearance{
Char: ".",
ColorSet: &TileColorSet{
Fg: func() uint32 {return blt.ColorFromARGB(255, 220,220,250)},
Bg: func() uint32 {return blt.ColorFromARGB(255, 19,19,70)},
DarkFg: func() uint32 {return blt.ColorFromARGB(255, 30,20,50)},
DarkBg: func() uint32 {return blt.ColorFromARGB(255, 7,7,30)},
Fg: func() uint32 { return blt.ColorFromARGB(255, 220, 220, 250) },
Bg: func() uint32 { return blt.ColorFromARGB(255, 19, 19, 70) },
DarkFg: func() uint32 { return blt.ColorFromARGB(255, 30, 20, 50) },
DarkBg: func() uint32 { return blt.ColorFromARGB(255, 7, 7, 30) },
},
},
}
}
func NewWaterTile() *Tile {
ch := &ColorHolder{19,19,70}
return &Tile {
Name: "Water",
ch := &ColorHolder{19, 19, 70}
return &Tile{
Name: "Water",
Description: "Murky water",
BlocksPass: false,
BlocksPass: false,
BlocksSight: false,
Explored: false,
MustDraw: true, //fixme debug
Explored: false,
MustDraw: true, //fixme debug
Appearance: &Appearance{
Char: ".",
ColorSet: &TileColorSet{
current: ch,
Fg: func() uint32 {return blt.ColorFromARGB(255, 220,220,250)},
Fg: func() uint32 { return blt.ColorFromARGB(255, 220, 220, 250) },
Bg: func() uint32 {
return blt.ColorFromARGB(
255,
ch.R,
colordance(ch.G, 2, 42, 4 ),
colordance(ch.B, 180,229,12),
colordance(ch.G, 2, 42, 4),
colordance(ch.B, 180, 229, 12),
)
},
DarkFg: func() uint32 {return blt.ColorFromARGB(255, 30,20,50)},
DarkBg: func() uint32 {return blt.ColorFromARGB(255, 7,7,30)},
DarkFg: func() uint32 { return blt.ColorFromARGB(255, 30, 20, 50) },
DarkBg: func() uint32 { return blt.ColorFromARGB(255, 7, 7, 30) },
},
},
}
}
func NewDeepWaterTile() *Tile {
ch := &ColorHolder{5,2,154}
return &Tile {
Name: "Deep Water",
ch := &ColorHolder{5, 2, 154}
return &Tile{
Name: "Deep Water",
Description: "Deep water",
BlocksPass: false,
BlocksPass: false,
BlocksSight: false,
Explored: false,
MustDraw: true, //fixme debug
Explored: false,
MustDraw: true, //fixme debug
Appearance: &Appearance{
Char: " ",
ColorSet: &TileColorSet{
current: ch,
Fg: func() uint32 {return blt.ColorFromARGB(255, 220,220,250)},
Fg: func() uint32 { return blt.ColorFromARGB(255, 220, 220, 250) },
Bg: func() uint32 {
return blt.ColorFromARGB(
255,
ch.R,
colordance(ch.G, 0, 15, 2 ),
colordance(ch.B, 120,180,5),
colordance(ch.G, 0, 15, 2),
colordance(ch.B, 120, 180, 5),
)
},
DarkFg: func() uint32 {return blt.ColorFromARGB(255, 30,20,50)},
DarkBg: func() uint32 {return blt.ColorFromARGB(255, 7,7,30)},
DarkFg: func() uint32 { return blt.ColorFromARGB(255, 30, 20, 50) },
DarkBg: func() uint32 { return blt.ColorFromARGB(255, 7, 7, 30) },
},
},
}
}