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

Fade out dice rolls instead of hiding them

Browse source
This commit is contained in:
Trevor Slocum 2023-12-07 14:24:36 -08:00
parent aa720a0a80
commit 7dd1433f5e
3 changed files with 110 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -1,3 +1,6 @@
1.1.8:
- Fade out dice rolls instead of hiding them
1.1.7:
- Fix highlighting available moves

94
game/board.go
View file

@ -56,6 +56,11 @@ type board struct {
gameState *bgammon.GameState
opponentRoll1, opponentRoll2 int
opponentRollStale bool
playerRoll1, playerRoll2 int
playerRollStale bool
debug int // Print and draw debug information
Client *Client
@ -991,13 +996,6 @@ func (b *board) Draw(screen *ebiten.Image) {
}
b.stateLock.Lock()
playerRoll := b.gameState.Roll1
opponentRoll := b.gameState.Roll2
roll1 := b.gameState.Roll1
roll2 := b.gameState.Roll2
if b.gameState.PlayerNumber == 2 {
playerRoll, opponentRoll = opponentRoll, playerRoll
}
var highlightSpaces [][]int
dragging := b.dragging
if b.dragging != nil && b.highlightAvailable && b.draggingSpace != -1 {
@ -1042,6 +1040,7 @@ func (b *board) Draw(screen *ebiten.Image) {
// Draw opponent dice
const diceFadeAlpha = 0.1
diceGap := 10.0
if game.screenW < 800 {
v := 10.0 * (float64(game.screenW) / 800)
@ -1059,23 +1058,38 @@ func (b *board) Draw(screen *ebiten.Image) {
opponent := b.gameState.OpponentPlayer()
if opponent.Name != "" {
innerCenter := b.innerBoardCenter(false)
alpha := float32(1.0)
if b.gameState.Turn == 0 {
if opponentRoll != 0 {
if b.gameState.Roll2 == 0 {
alpha = diceFadeAlpha
}
} else if b.opponentRollStale || b.gameState.Turn == 1 {
alpha = diceFadeAlpha
}
op := &ebiten.DrawImageOptions{}
op.ColorScale.ScaleAlpha(alpha)
d1, d2 := b.opponentRoll1, b.opponentRoll2
if b.gameState.Turn == 0 {
if d2 != 0 {
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(innerCenter-diceSize/2), float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(opponentRoll), op)
}
} else if b.gameState.Turn != b.gameState.PlayerNumber && roll1 != 0 {
{
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(innerCenter-diceSize)-diceGap, float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(roll1), op)
screen.DrawImage(diceImage(d2), op)
}
} else {
if d1 != 0 && d2 != 0 {
{
op.GeoM.Translate(float64(innerCenter-diceSize)-diceGap, float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(d1), op)
}
{
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(innerCenter)+diceGap, float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(roll2), op)
{
op.GeoM.Reset()
op.GeoM.Translate(float64(innerCenter)+diceGap, float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(d2), op)
}
}
}
}
@ -1085,23 +1099,37 @@ func (b *board) Draw(screen *ebiten.Image) {
player := b.gameState.LocalPlayer()
if player.Name != "" {
innerCenter := b.innerBoardCenter(true)
alpha := float32(1.0)
if b.gameState.Turn == 0 {
if playerRoll != 0 {
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(innerCenter-diceSize/2), float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(playerRoll), op)
}
} else if b.gameState.Turn == b.gameState.PlayerNumber && roll1 != 0 {
{
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(innerCenter-diceSize)-diceGap, float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(roll1), op)
if b.gameState.Roll1 == 0 {
alpha = diceFadeAlpha
}
} else if b.playerRollStale || b.gameState.Turn == 2 {
alpha = diceFadeAlpha
}
{
op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(float64(innerCenter)+diceGap, float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(roll2), op)
op := &ebiten.DrawImageOptions{}
op.ColorScale.ScaleAlpha(alpha)
d1, d2 := b.playerRoll1, b.playerRoll2
if b.gameState.Turn == 0 {
if d1 != 0 {
op.GeoM.Translate(float64(innerCenter-diceSize/2), float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(d1), op)
}
} else {
if d1 != 0 && d2 != 0 {
{
op.GeoM.Translate(float64(innerCenter-diceSize)-diceGap, float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(d1), op)
}
{
op.GeoM.Reset()
op.GeoM.Translate(float64(innerCenter)+diceGap, float64(b.y+(b.innerH/2))-diceGap-float64(diceSize))
screen.DrawImage(diceImage(d2), op)
}
}
}
}

47
game/game.go
View file

@ -39,7 +39,7 @@ import (
"golang.org/x/text/language"
)
const version = "v1.1.7"
const version = "v1.1.7p1"
const MaxDebug = 2
@ -966,6 +966,10 @@ func (g *Game) handleEvent(e interface{}) {
} else if ev.PlayerNumber == 2 {
g.Board.gameState.Player2.Name = ev.Player
}
g.Board.playerRoll1, g.Board.playerRoll2 = 0, 0
g.Board.opponentRoll1, g.Board.opponentRoll2 = 0, 0
g.Board.playerRollStale = false
g.Board.opponentRollStale = false
g.Board.processState()
g.Board.Unlock()
setViewBoard(true)
@ -1002,6 +1006,36 @@ func (g *Game) handleEvent(e interface{}) {
g.Board.stateLock.Lock()
*g.Board.gameState = ev.GameState
*g.Board.gameState.Game = *ev.GameState.Game
if g.Board.gameState.Turn == 0 {
if g.Board.playerRoll2 != 0 {
g.Board.playerRoll1, g.Board.playerRoll2 = 0, 0
}
if g.Board.opponentRoll1 != 0 {
g.Board.opponentRoll1, g.Board.opponentRoll2 = 0, 0
}
if g.Board.gameState.Roll1 != 0 {
g.Board.playerRoll1 = g.Board.gameState.Roll1
}
if g.Board.gameState.Roll2 != 0 {
g.Board.opponentRoll2 = g.Board.gameState.Roll2
}
} else if g.Board.gameState.Roll1 != 0 {
if g.Board.gameState.Turn == 1 {
g.Board.playerRoll1, g.Board.playerRoll2 = g.Board.gameState.Roll1, g.Board.gameState.Roll2
g.Board.playerRollStale = false
g.Board.opponentRollStale = true
if g.Board.opponentRoll1 == 0 || g.Board.opponentRoll2 == 0 {
g.Board.opponentRoll1, g.Board.opponentRoll2 = 0, 0
}
} else {
g.Board.opponentRoll1, g.Board.opponentRoll2 = g.Board.gameState.Roll1, g.Board.gameState.Roll2
g.Board.opponentRollStale = false
g.Board.playerRollStale = true
if g.Board.playerRoll1 == 0 || g.Board.playerRoll2 == 0 {
g.Board.playerRoll1, g.Board.playerRoll2 = 0, 0
}
}
}
g.Board.stateLock.Unlock()
g.Board.processState()
g.Board.Unlock()
@ -1015,12 +1049,23 @@ func (g *Game) handleEvent(e interface{}) {
if g.Board.gameState.Turn == 0 {
if g.Board.gameState.Player1.Name == ev.Player {
diceFormatted = fmt.Sprintf("%d", g.Board.gameState.Roll1)
g.Board.playerRoll1 = g.Board.gameState.Roll1
g.Board.playerRollStale = false
} else {
diceFormatted = fmt.Sprintf("%d", g.Board.gameState.Roll2)
g.Board.opponentRoll2 = g.Board.gameState.Roll2
g.Board.opponentRollStale = false
}
playSoundEffect(effectDie)
} else {
diceFormatted = fmt.Sprintf("%d-%d", g.Board.gameState.Roll1, g.Board.gameState.Roll2)
if g.Board.gameState.Turn == 1 {
g.Board.playerRoll1, g.Board.playerRoll2 = g.Board.gameState.Roll1, g.Board.gameState.Roll2
g.Board.playerRollStale = false
} else {
g.Board.opponentRoll1, g.Board.opponentRoll2 = g.Board.gameState.Roll1, g.Board.gameState.Roll2
g.Board.opponentRollStale = false
}
playSoundEffect(effectDice)
}
g.Board.stateLock.Unlock()