Remember guest username
This commit is contained in:
parent
68f367ceb1
commit
e883106142
4 changed files with 26 additions and 24 deletions
|
|
@ -1,3 +1,6 @@
|
|||
1.2.9:
|
||||
- Remember guest username
|
||||
|
||||
1.2.8:
|
||||
- Fix interface scaling on Android
|
||||
|
||||
|
|
|
|||
35
game/game.go
35
game/game.go
|
|
@ -39,21 +39,21 @@ import (
|
|||
"golang.org/x/text/language"
|
||||
)
|
||||
|
||||
const version = "v1.2.8"
|
||||
const (
|
||||
version = "v1.2.9"
|
||||
baseButtonHeight = 54
|
||||
MaxDebug = 2
|
||||
DefaultServerAddress = "wss://ws.bgammon.org"
|
||||
)
|
||||
|
||||
const DefaultServerAddress = "wss://ws.bgammon.org"
|
||||
|
||||
const MaxDebug = 2
|
||||
|
||||
const baseButtonHeight = 54
|
||||
|
||||
var onlyNumbers = regexp.MustCompile(`[0-9]+`)
|
||||
var (
|
||||
anyNumbers = regexp.MustCompile(`[0-9]+`)
|
||||
onlyNumbers = regexp.MustCompile(`^[0-9]+$`)
|
||||
)
|
||||
|
||||
//go:embed asset locales
|
||||
var assetFS embed.FS
|
||||
|
||||
var debugExtra []byte
|
||||
|
||||
var (
|
||||
imgCheckerTop *ebiten.Image
|
||||
imgCheckerSide *ebiten.Image
|
||||
|
|
@ -1366,6 +1366,12 @@ func (g *Game) handleEvent(e interface{}) {
|
|||
g.Client.Username = ev.PlayerName
|
||||
g.register = false
|
||||
|
||||
username := ev.PlayerName
|
||||
if strings.HasPrefix(username, "Guest_") && !onlyNumbers.MatchString(username[6:]) {
|
||||
username = username[6:]
|
||||
}
|
||||
go saveUsername(username)
|
||||
|
||||
areIs := "are"
|
||||
if ev.Clients == 1 {
|
||||
areIs = "is"
|
||||
|
|
@ -2143,9 +2149,7 @@ func (g *Game) Connect() {
|
|||
}
|
||||
}()
|
||||
|
||||
username := g.Username
|
||||
go c.Connect()
|
||||
go saveUsername(username)
|
||||
|
||||
// TODO
|
||||
|
||||
|
|
@ -2577,7 +2581,7 @@ func (g *Game) Update() error {
|
|||
if g.lobby.showCreateGame {
|
||||
pointsText := g.lobby.createGamePoints.Text()
|
||||
if pointsText != "" {
|
||||
g.lobby.createGamePoints.SetText(strings.Join(onlyNumbers.FindAllString(pointsText, -1), ""))
|
||||
g.lobby.createGamePoints.SetText(strings.Join(anyNumbers.FindAllString(pointsText, -1), ""))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2669,11 +2673,6 @@ func (g *Game) Draw(screen *ebiten.Image) {
|
|||
|
||||
g.drawBuffer.Write([]byte(fmt.Sprintf("FPS %c %0.0f", spinner[g.spinnerIndex], ebiten.ActualFPS())))
|
||||
|
||||
if debugExtra != nil {
|
||||
g.drawBuffer.WriteRune('\n')
|
||||
g.drawBuffer.Write(debugExtra)
|
||||
}
|
||||
|
||||
g.debugImg.Clear()
|
||||
|
||||
ebitenutil.DebugPrint(g.debugImg, g.drawBuffer.String())
|
||||
|
|
|
|||
4
go.mod
4
go.mod
|
|
@ -3,11 +3,11 @@ module code.rocket9labs.com/tslocum/boxcars
|
|||
go 1.17
|
||||
|
||||
require (
|
||||
code.rocket9labs.com/tslocum/bgammon v0.0.0-20240129035636-da833ac5c9f1
|
||||
code.rocket9labs.com/tslocum/bgammon v0.0.0-20240130031914-e8be3d713856
|
||||
code.rocket9labs.com/tslocum/bgammon-tabula-bot v0.0.0-20240124065706-7b67c39b4d3d
|
||||
code.rocket9labs.com/tslocum/etk v0.0.0-20240129045146-b1b41487c2ec
|
||||
code.rocket9labs.com/tslocum/tabula v0.0.0-20240124065607-37b7f72a0ff2
|
||||
github.com/hajimehoshi/ebiten/v2 v2.6.4
|
||||
github.com/hajimehoshi/ebiten/v2 v2.6.5
|
||||
github.com/leonelquinteros/gotext v1.5.3-0.20231003122255-12a99145a351
|
||||
github.com/llgcode/draw2d v0.0.0-20231212091825-f55e0c776b44
|
||||
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
|
||||
|
|
|
|||
8
go.sum
8
go.sum
|
|
@ -1,7 +1,7 @@
|
|||
code.rocket9labs.com/tslocum/bei v0.0.0-20240108012722-6db380cc190b h1:Y0a14Kf/hSYepSmp4ZfDeE4CZZGBGBS97CNjCbKJm0c=
|
||||
code.rocket9labs.com/tslocum/bei v0.0.0-20240108012722-6db380cc190b/go.mod h1:tS60/VNAJphKvDBkSLQhKALa15msIAuWWfEKNc4oFZc=
|
||||
code.rocket9labs.com/tslocum/bgammon v0.0.0-20240129035636-da833ac5c9f1 h1:Y723uf0k6OlDCsQly70wx1O4MAmgpNzIXK4S/Ij53Dw=
|
||||
code.rocket9labs.com/tslocum/bgammon v0.0.0-20240129035636-da833ac5c9f1/go.mod h1:RHdn3gly2SF45Z/pHo1KZf12oc4Uu4XL7Gn7oe+h4/I=
|
||||
code.rocket9labs.com/tslocum/bgammon v0.0.0-20240130031914-e8be3d713856 h1:XecVX2Dyr+AjAcxGN+/Mj8E+nCPRs4kykfhVU7gNWCA=
|
||||
code.rocket9labs.com/tslocum/bgammon v0.0.0-20240130031914-e8be3d713856/go.mod h1:RHdn3gly2SF45Z/pHo1KZf12oc4Uu4XL7Gn7oe+h4/I=
|
||||
code.rocket9labs.com/tslocum/bgammon-tabula-bot v0.0.0-20240124065706-7b67c39b4d3d h1:ri8Oqo+nhPZ1/715SLBjqVcGysJe/BkBB7nsQrK5xm4=
|
||||
code.rocket9labs.com/tslocum/bgammon-tabula-bot v0.0.0-20240124065706-7b67c39b4d3d/go.mod h1:fcuzpHuCmd+F5D0x8/bI3qPK8FxwIsUthGd9T9dgfww=
|
||||
code.rocket9labs.com/tslocum/etk v0.0.0-20240129045146-b1b41487c2ec h1:x7E1xswSuaVl02KOq77iH+uBRSUtAGJZN3IxA1rW0UA=
|
||||
|
|
@ -54,8 +54,8 @@ github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A
|
|||
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
|
||||
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
|
||||
github.com/hajimehoshi/bitmapfont/v3 v3.0.0 h1:r2+6gYK38nfztS/et50gHAswb9hXgxXECYgE8Nczmi4=
|
||||
github.com/hajimehoshi/ebiten/v2 v2.6.4 h1:G6tABZ4/njmi8Qn/l4Bqq49UrONrWW7TKcMMOSjPcpk=
|
||||
github.com/hajimehoshi/ebiten/v2 v2.6.4/go.mod h1:TZtorL713an00UW4LyvMeKD8uXWnuIuCPtlH11b0pgI=
|
||||
github.com/hajimehoshi/ebiten/v2 v2.6.5 h1:lALv+qhEK3CBWViyiGpz4YcR6slVJEjCiS7sExKZ9OE=
|
||||
github.com/hajimehoshi/ebiten/v2 v2.6.5/go.mod h1:TZtorL713an00UW4LyvMeKD8uXWnuIuCPtlH11b0pgI=
|
||||
github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
|
||||
github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
|
||||
github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
|
||||
|
|
|
|||
Loading…
Reference in a new issue