diff --git a/go.mod b/go.mod index 734967d..d557ae6 100644 --- a/go.mod +++ b/go.mod @@ -2,15 +2,21 @@ module github.com/pankona/gj go 1.22.4 -require github.com/hajimehoshi/ebiten/v2 v2.7.5 +require ( + github.com/hajimehoshi/bitmapfont/v3 v3.0.0 + github.com/hajimehoshi/ebiten/v2 v2.7.5 +) require ( github.com/ebitengine/gomobile v0.0.0-20240518074828-e86332849895 // indirect github.com/ebitengine/hideconsole v1.0.0 // indirect github.com/ebitengine/oto/v3 v3.2.0 // indirect github.com/ebitengine/purego v0.7.0 // indirect + github.com/go-text/typesetting v0.1.1-0.20240325125605-c7936fe59984 // indirect github.com/hajimehoshi/go-mp3 v0.3.4 // indirect github.com/jezek/xgb v1.1.1 // indirect + golang.org/x/image v0.16.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect ) diff --git a/go.sum b/go.sum index 107f793..7998be3 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,12 @@ github.com/ebitengine/oto/v3 v3.2.0 h1:FuggTJTSI3/3hEYwZEIN0CZVXYT29ZOdCu+z/f4Qj github.com/ebitengine/oto/v3 v3.2.0/go.mod h1:dOKXShvy1EQbIXhXPFcKLargdnFqH0RjptecvyAxhyw= github.com/ebitengine/purego v0.7.0 h1:HPZpl61edMGCEW6XK2nsR6+7AnJ3unUxpTZBkkIXnMc= github.com/ebitengine/purego v0.7.0/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ= -github.com/hajimehoshi/ebiten/v2 v2.7.4 h1:X+heODRQ3Ie9F9QFjm24gEZqQd5FSfR9XuT2XfHwgf8= -github.com/hajimehoshi/ebiten/v2 v2.7.4/go.mod h1:H2pHVgq29rfm5yeQ7jzWOM3VHsjo7/AyucODNLOhsVY= +github.com/go-text/typesetting v0.1.1-0.20240325125605-c7936fe59984 h1:NwCC36eQsDf1xVZG9jD7ngXNNjsvk8KXky15ogA1Vo0= +github.com/go-text/typesetting v0.1.1-0.20240325125605-c7936fe59984/go.mod h1:2+owI/sxa73XA581LAzVuEBZ3WEEV2pXeDswCH/3i1I= +github.com/go-text/typesetting-utils v0.0.0-20240317173224-1986cbe96c66 h1:GUrm65PQPlhFSKjLPGOZNPNxLCybjzjYBzjfoBGaDUY= +github.com/go-text/typesetting-utils v0.0.0-20240317173224-1986cbe96c66/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o= +github.com/hajimehoshi/bitmapfont/v3 v3.0.0 h1:r2+6gYK38nfztS/et50gHAswb9hXgxXECYgE8Nczmi4= +github.com/hajimehoshi/bitmapfont/v3 v3.0.0/go.mod h1:+CxxG+uMmgU4mI2poq944i3uZ6UYFfAkj9V6WqmuvZA= github.com/hajimehoshi/ebiten/v2 v2.7.5 h1:jN6FnhCd9NGYCsm5GtrweuikrlyVGCSUpH5YgL+7UKA= github.com/hajimehoshi/ebiten/v2 v2.7.5/go.mod h1:H2pHVgq29rfm5yeQ7jzWOM3VHsjo7/AyucODNLOhsVY= github.com/hajimehoshi/go-mp3 v0.3.4 h1:NUP7pBYH8OguP4diaTZ9wJbUbk3tC0KlfzsEpWmYj68= @@ -15,10 +19,39 @@ github.com/hajimehoshi/go-mp3 v0.3.4/go.mod h1:fRtZraRFcWb0pu7ok0LqyFhCUrPeMsGRS github.com/hajimehoshi/oto/v2 v2.3.1/go.mod h1:seWLbgHH7AyUMYKfKYT9pg7PhUu9/SisyJvNTT+ASQo= github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4= github.com/jezek/xgb v1.1.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/image v0.1.0/go.mod h1:iyPr49SD/G/TBxYVB/9RRtGUT5eNbo2u4NamWeQcD5c= golang.org/x/image v0.16.0 h1:9kloLAKhUufZhA12l5fwnx2NZW39/we1UhBesW433jw= golang.org/x/image v0.16.0/go.mod h1:ugSZItdV4nOxyqp56HmXwH0Ry0nBCpjnZdpDaIHdoPs= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/main.go b/main.go index 63a6cfd..b79deb9 100644 --- a/main.go +++ b/main.go @@ -63,7 +63,7 @@ const ( const ( // 画面上にデバッグ情報を表示するかどうか - debugEnabled = true + debugEnabled = false ) const ( @@ -111,20 +111,15 @@ func (g *Game) Update() error { func (g *Game) Draw(screen *ebiten.Image) { g.drawHandler.HandleDraw(screen) - // 現在のフェーズを表示 - switch g.phase { - case PhaseBuilding: - ebitenutil.DebugPrintAt(screen, "Phase: Building", 0, 40) - case PhaseWave: - ebitenutil.DebugPrintAt(screen, "Phase: Wave", 0, 40) - } - - // 画面右上にクレジットを表示 - ebitenutil.DebugPrintAt(screen, fmt.Sprintf("Credit: %d", g.credit), screenWidth-100, 0) - // 以下はデバッグ情報 - if debugEnabled { + // 現在のフェーズを表示 + switch g.phase { + case PhaseBuilding: + ebitenutil.DebugPrintAt(screen, "Phase: Building", 0, 40) + case PhaseWave: + ebitenutil.DebugPrintAt(screen, "Phase: Wave", 0, 40) + } // クリックされた位置を表示 ebitenutil.DebugPrintAt(screen, fmt.Sprintf("Clicked Position: (%d, %d)", g.clickedPositionX, g.clickedPositionY), 0, 0) // クリックされたオブジェクトを表示 @@ -153,6 +148,9 @@ func (g *Game) Draw(screen *ebiten.Image) { } } ebitenutil.DebugPrintAt(screen, fmt.Sprintf("Active Audio: %d", activeAudioNum), 0, 160) + + // 画面右上にクレジットを表示 + ebitenutil.DebugPrintAt(screen, fmt.Sprintf("Credit: %d", g.credit), screenWidth-100, 0) } } @@ -277,6 +275,10 @@ func main() { // 最初のシーンをセットアップする g.SetBuildingPhase() + title := newTitle(g) + g.drawHandler.Add(title) + g.clickHandler.Add(title) + if err := ebiten.RunGame(g); err != nil { log.Fatal(err) } diff --git a/title.go b/title.go new file mode 100644 index 0000000..01e30f9 --- /dev/null +++ b/title.go @@ -0,0 +1,156 @@ +package main + +import ( + "bytes" + "image" + "image/color" + "log" + + "github.com/hajimehoshi/bitmapfont/v3" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/text/v2" +) + +type title struct { + game *Game + + stopFrame int + + houseImg *ebiten.Image + barricadeImg *ebiten.Image + redBugImg *ebiten.Image + blueBugImg *ebiten.Image + greenBugImg *ebiten.Image +} + +func newTitle(g *Game) *title { + // いったん BGM 止める + getAudioPlayer().stopBGM() + + houseImg, _, err := image.Decode(bytes.NewReader(houseImageData)) + if err != nil { + log.Fatal(err) + } + + barricadeImg, _, err := image.Decode(bytes.NewReader(barricadeImageData)) + if err != nil { + log.Fatal(err) + } + + bugsImgD, _, err := image.Decode(bytes.NewReader(bugsImageData)) + if err != nil { + log.Fatal(err) + } + bugsImg := ebiten.NewImageFromImage(bugsImgD) + + return &title{ + game: g, + stopFrame: 120, + houseImg: ebiten.NewImageFromImage(houseImg), + barricadeImg: ebiten.NewImageFromImage(barricadeImg), + redBugImg: bugsImg.SubImage(redBug()).(*ebiten.Image), + blueBugImg: bugsImg.SubImage(blueBug()).(*ebiten.Image), + greenBugImg: bugsImg.SubImage(greenBug()).(*ebiten.Image), + } +} + +func (t *title) OnClick(x, y int) bool { + // タイタオルバックを非表示にする + getAudioPlayer().play(soundShot) + t.game.clickHandler.Remove(t) + t.game.updateHandler.Add(t) + return false +} + +func (t *title) Update() { + // 数病経過したらゲーム画面に遷移する + t.stopFrame-- + if t.stopFrame <= 0 { + t.game.drawHandler.Remove(t) + t.game.updateHandler.Remove(t) + getAudioPlayer().playBGM() + } +} + +func (t *title) IsClicked(x, y int) bool { + return true +} + +func (t *title) Draw(screen *ebiten.Image) { + // やや濃い緑で塗りつぶす + screen.Fill(color.RGBA{0x00, 0x45, 0x00, 0xff}) + + // 家を描く + { + width, height := t.houseImg.Bounds().Dx(), t.houseImg.Bounds().Dy() + op := &ebiten.DrawImageOptions{} + scaleX, scaleY := 2.5, 2.5 + op.GeoM.Scale(scaleX, scaleY) + op.GeoM.Translate(float64(screenWidth-float64(width)*scaleX)/2-300, float64(screenHeight-float64(height)*scaleY)/2-200) + screen.DrawImage(t.houseImg, op) + } + + // バリケードを 3 つほど描く + width, height := t.barricadeImg.Bounds().Dx(), t.barricadeImg.Bounds().Dy() + scaleX, scaleY := 2.5, 2.5 + var op *ebiten.DrawImageOptions + + op = &ebiten.DrawImageOptions{} + op.GeoM.Scale(scaleX, scaleY) + op.GeoM.Translate(float64(screenWidth-float64(width)*scaleX)/2+200, float64(screenHeight-float64(height)*scaleY)/2-100) + screen.DrawImage(t.barricadeImg, op) + + op = &ebiten.DrawImageOptions{} + op.GeoM.Scale(scaleX, scaleY) + op.GeoM.Translate(float64(screenWidth-float64(width)*scaleX)/2, float64(screenHeight-float64(height)*scaleY)/2) + screen.DrawImage(t.barricadeImg, op) + + op = &ebiten.DrawImageOptions{} + op.GeoM.Scale(scaleX, scaleY) + op.GeoM.Translate(float64(screenWidth-float64(width)*scaleX)/2-200, float64(screenHeight-float64(height)*scaleY)/2+100) + screen.DrawImage(t.barricadeImg, op) + + // 虫を描く + { + scaleX, scaleY := float64(5), float64(5) + + width, height := t.redBugImg.Bounds().Dx(), t.redBugImg.Bounds().Dy() + op := &ebiten.DrawImageOptions{} + op.GeoM.Scale(scaleX, scaleY) + op.GeoM.Translate(float64(screenWidth-float64(width)*scaleX)/2+200+100, float64(screenHeight-float64(height)*scaleY)/2+100) + screen.DrawImage(t.redBugImg, op) + + width, height = t.blueBugImg.Bounds().Dx(), t.blueBugImg.Bounds().Dy() + op = &ebiten.DrawImageOptions{} + op.GeoM.Scale(scaleX, scaleY) + op.GeoM.Translate(float64(screenWidth-float64(width)*scaleX)/2+100, float64(screenHeight-float64(height)*scaleY)/2+200) + screen.DrawImage(t.blueBugImg, op) + + width, height = t.greenBugImg.Bounds().Dx(), t.greenBugImg.Bounds().Dy() + op = &ebiten.DrawImageOptions{} + op.GeoM.Scale(scaleX, scaleY) + op.GeoM.Translate(float64(screenWidth-float64(width)*scaleX)/2-200+100, float64(screenHeight-float64(height)*scaleY)/2+300) + screen.DrawImage(t.greenBugImg, op) + } + + // 文字を描く + clr := color.RGBA{R: 0x80, G: 0x80, B: 0x80, A: 0xff} + scaleX, scaleY = float64(5), float64(5) + + textOp := &text.DrawOptions{} + textOp.ColorScale.ScaleWithColor(clr) + textOp.GeoM.Scale(scaleX, scaleY) + textOp.GeoM.Translate(float64(screenWidth-750), 100) + text.Draw(screen, "HOUSE DEFENSE OPERATION!", text.NewGoXFace(bitmapfont.Face), textOp) + + textOp = &text.DrawOptions{} + textOp.ColorScale.ScaleWithColor(clr) + textOp.GeoM.Scale(scaleX, scaleY) + textOp.GeoM.Translate(float64(screenWidth-750), 170) + text.Draw(screen, "CLICK TO START!", text.NewGoXFace(bitmapfont.Face), textOp) + +} + +func (t *title) ZIndex() int { + return 300 +}