tslocum/boxcars
tslocum/boxcars
1
0
Fork 0
Code Issues 9 Pull requests Projects Releases Wiki Activity

Fix player name and dice alignment

Browse source
This commit is contained in:
Trevor Slocum 2023-10-28 15:10:31 -07:00
parent 83315cffbb
commit cb8feff508
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -1,3 +1,6 @@
1.0.4:
- Optimize user interface for mobile devices
1.0.3:
- Add connect button
- Add touch input support

18
game/board.go
View file

@ -661,7 +661,8 @@ func (b *board) Draw(screen *ebiten.Image) {
img := drawLabel(label, opponentColor, b.gameState.Turn != b.gameState.PlayerNumber, opponentBorderColor)
bounds := img.Bounds()
x := b.x + int(((float64(b.innerW))/4)-(float64(bounds.Dx()/2))) - int(b.horizontalBorderSize)/2
innerCenter := b.x + (b.w / 4) - int(b.barWidth/4) + int(b.horizontalBorderSize/2)
x := innerCenter - int(float64(bounds.Dx()/2))
y := b.y + (b.innerH / 2) - (bounds.Dy() / 2) + int(b.verticalBorderSize)
{
op := &ebiten.DrawImageOptions{}
@ -672,19 +673,19 @@ func (b *board) Draw(screen *ebiten.Image) {
if b.gameState.Turn == 0 {
if opponentRoll != 0 {
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(b.x+(b.innerW/4)-int(b.horizontalBorderSize)/2-diceSize/2), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
op.GeoM.Translate(float64(innerCenter-diceSize/2), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
screen.DrawImage(diceImage(opponentRoll), op)
}
} else if b.gameState.Turn != b.gameState.PlayerNumber && b.gameState.Roll1 != 0 {
{
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(b.x+(b.innerW/4)-int(b.horizontalBorderSize)/2-diceSize-diceGap), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
op.GeoM.Translate(float64(innerCenter-diceSize-diceGap), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
screen.DrawImage(diceImage(b.gameState.Roll1), op)
}
{
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(b.x+(b.innerW/4)-int(b.horizontalBorderSize)/2+diceGap), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
op.GeoM.Translate(float64(innerCenter+diceGap), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
screen.DrawImage(diceImage(b.gameState.Roll2), op)
}
}
@ -699,7 +700,8 @@ func (b *board) Draw(screen *ebiten.Image) {
img := drawLabel(label, playerColor, b.gameState.Turn == b.gameState.PlayerNumber, playerBorderColor)
bounds := img.Bounds()
x := b.x + int((((float64(b.innerW))/4)*3)-(float64(bounds.Dx()/2))) + int(b.horizontalBorderSize)/2
innerCenter := b.x + b.w/2 + b.w/4 + int(b.barWidth/4) - int(b.horizontalBorderSize/2)
x := innerCenter - int(float64(bounds.Dx()/2))
y := b.y + (b.innerH / 2) - (bounds.Dy() / 2) + int(b.verticalBorderSize)
{
op := &ebiten.DrawImageOptions{}
@ -710,19 +712,19 @@ func (b *board) Draw(screen *ebiten.Image) {
if b.gameState.Turn == 0 {
if playerRoll != 0 {
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(b.x+((b.innerW/4)*3)+int(b.horizontalBorderSize)/2-diceSize/2), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
op.GeoM.Translate(float64(innerCenter-diceSize/2), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
screen.DrawImage(diceImage(playerRoll), op)
}
} else if b.gameState.Turn == b.gameState.PlayerNumber && b.gameState.Roll1 != 0 {
{
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(b.x+((b.innerW/4)*3)+int(b.horizontalBorderSize)/2-diceSize-diceGap), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
op.GeoM.Translate(float64(innerCenter-diceSize-diceGap), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
screen.DrawImage(diceImage(b.gameState.Roll1), op)
}
{
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(b.x+((b.innerW/4)*3)+int(b.horizontalBorderSize)/2+diceGap), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
op.GeoM.Translate(float64(innerCenter+diceGap), float64(b.y+(b.innerH/2))-(float64(diceSize)*1.4))
screen.DrawImage(diceImage(b.gameState.Roll2), op)
}
}

2
game/game.go
View file

@ -29,7 +29,7 @@ import (
"golang.org/x/image/font/opentype"
)
const version = "v1.0.3"
const version = "v1.0.4"
const MaxDebug = 1