Merge pull request #47 from pankona/show-monery-earned

show money earned

Author: pankona

barricade.go

@@ -7,9 +7,9 @@ import (
 	"log"
 
 	"github.com/hajimehoshi/ebiten/v2"
-	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
 
 	_ "embed"
+	"image/color"
 	_ "image/png"
 )
 
@@ -157,10 +157,11 @@ func (b *barricade) OnClick(x, y int) bool {
 	b.game.infoPanel.setIcon(icon)
 	b.game.infoPanel.setUnit(b)
 	b.game.infoPanel.drawDescriptionFn = func(screen *ebiten.Image, x, y int) {
-		ebitenutil.DebugPrintAt(screen, "I am Barricade!", x, y)
-		ebitenutil.DebugPrintAt(screen, fmt.Sprintf("Cost: $%d", b.Cost()), x, y+20)
+		var scale float64 = 2
+		drawText(screen, "I am Barricade!", x, y-10, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
+		drawText(screen, fmt.Sprintf("Cost: $%d", b.Cost()), x, y+20, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
 		// 敵の進行を邪魔するという説明を記載する
-		ebitenutil.DebugPrintAt(screen, "Blocks enemy's advance!", x, y+40)
+		drawText(screen, "Blocks enemy's advance!", x, y+50, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
 	}
 
 	return false

gameclear.go

@@ -4,7 +4,6 @@ import (
 	"image/color"
 
 	"github.com/hajimehoshi/ebiten/v2"
-	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
 	"github.com/hajimehoshi/ebiten/v2/vector"
 )
 
@@ -57,8 +56,8 @@ func (g *gameclear) Draw(screen *ebiten.Image) {
 	// 画面全体を半透明の黒で覆う
 	vector.DrawFilledRect(screen, 0, 0, screenWidth, screenHeight, color.RGBA{0, 0, 0, 0x90}, true)
 
-	// とりあえず画面中央に Game Clear って出す
-	ebitenutil.DebugPrintAt(screen, "Congratulation! Game Clear!", screenWidth/2-80, eScreenHeight/2-20)
+	// 画面中央に勝った感のあるメッセージを出す
+	drawText(screen, "Congratulations! All waves over!", screenWidth/2-490, eScreenHeight/2-100, 5, 5, color.RGBA{0xff, 0xff, 0xff, 0xff})
 	// Click to Restart って出す
-	ebitenutil.DebugPrintAt(screen, "Click to Restart", screenWidth/2-50, eScreenHeight/2+10)
+	drawText(screen, "Click to Restart", screenWidth/2-230, eScreenHeight/2+100, 5, 5, color.RGBA{0xff, 0xff, 0xff, 0xff})
 }

gameover.go

@@ -4,7 +4,6 @@ import (
 	"image/color"
 
 	"github.com/hajimehoshi/ebiten/v2"
-	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
 	"github.com/hajimehoshi/ebiten/v2/vector"
 )
 
@@ -58,8 +57,8 @@ func (g *gameover) Draw(screen *ebiten.Image) {
 	// 画面全体を半透明の黒で覆う
 	vector.DrawFilledRect(screen, 0, 0, screenWidth, screenHeight, color.RGBA{0, 0, 0, 0x90}, true)
 
-	// とりあえず画面中央に GameOver って出す
-	ebitenutil.DebugPrintAt(screen, "Game Over!", screenWidth/2-30, eScreenHeight/2-20)
+	// 画面中央に負けた感のあるメッセージを出す
+	drawText(screen, "You lose! House destroyed...", screenWidth/2-400, eScreenHeight/2-100, 5, 5, color.RGBA{0xff, 0xff, 0xff, 0xff})
 	// Click to Restart って出す
-	ebitenutil.DebugPrintAt(screen, "Click to Restart", screenWidth/2-50, eScreenHeight/2+10)
+	drawText(screen, "Click to Restart", screenWidth/2-230, eScreenHeight/2+100, 5, 5, color.RGBA{0xff, 0xff, 0xff, 0xff})
 }

house.go

@@ -52,7 +52,7 @@ func newHouse(game *Game) *house {
 		height: img.Bounds().Dy(),
 		scale:  0.5,
 
-		health: 100,
+		health: 1,
 
 		image: ebiten.NewImageFromImage(img),
 
@@ -193,10 +193,11 @@ func (h *house) OnClick(x, y int) bool {
 				h.game.infoPanel.drawDescriptionFn = func(screen *ebiten.Image, x, y int) {
 					x = x - 150
 					y = y + 10
-					ebitenutil.DebugPrintAt(screen, "I am Barricade!", x, y)
-					ebitenutil.DebugPrintAt(screen, fmt.Sprintf("Cost: $%d", b.Cost()), x, y+20)
+					var scale float64 = 2
+					drawText(screen, "I am Barricade!", x, y-15, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
+					drawText(screen, fmt.Sprintf("Cost: $%d", b.Cost()), x, y+15, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
 					// 敵の進行を邪魔するという説明を記載する
-					ebitenutil.DebugPrintAt(screen, "Blocks enemy's advance!", x, y+40)
+					drawText(screen, "Blocks enemy's advance!", x, y+45, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
 				}
 				return false
 			},
@@ -253,10 +254,11 @@ func (h *house) OnClick(x, y int) bool {
 				t.game.infoPanel.drawDescriptionFn = func(screen *ebiten.Image, x, y int) {
 					x = x - 150
 					y = y + 10
-					ebitenutil.DebugPrintAt(screen, "I am Beam Tower!", x, y)
-					ebitenutil.DebugPrintAt(screen, fmt.Sprintf("Cost: $%d", t.Cost()), x, y+20)
+					var scale float64 = 2
 					// 敵を一匹ずつ攻撃するという説明を記載する
-					ebitenutil.DebugPrintAt(screen, "Attack single bug by laser beam!", x, y+40)
+					drawText(screen, "I am Beam Tower!", x, y-15, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
+					drawText(screen, fmt.Sprintf("Cost: $%d", t.Cost()), x, y+15, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
+					drawText(screen, "Attack single bug by laser beam!", x, y+45, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
 				}
 				return false
 			},
@@ -312,10 +314,11 @@ func (h *house) OnClick(x, y int) bool {
 				h.game.infoPanel.drawDescriptionFn = func(screen *ebiten.Image, x, y int) {
 					x = x - 150
 					y = y + 10
-					ebitenutil.DebugPrintAt(screen, "I am Radio Tower!", x, y)
-					ebitenutil.DebugPrintAt(screen, fmt.Sprintf("Cost: $%d", rt.Cost()), x, y+20)
+					var scale float64 = 2
 					// 範囲攻撃するしレンジも広いが、近くは攻撃できない
-					ebitenutil.DebugPrintAt(screen, "Attacks in an area, effective at range, but cannot hit nearby enemies.", x, y+40)
+					drawText(screen, "I am Radio Tower!", x, y-15, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
+					drawText(screen, fmt.Sprintf("Cost: $%d", rt.Cost()), x, y+15, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
+					drawText(screen, "Attacks in area, cannot hit near bugs!", x, y+45, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
 				}
 				return false
 			},
@@ -366,10 +369,10 @@ func (h *house) OnClick(x, y int) bool {
 			},
 			func(screen *ebiten.Image, x, y, width, height int) {
 				drawRect(screen, x, y, width, height)
-				ebitenutil.DebugPrintAt(screen, "FINISH BUILDING!", x+width/2-45, y+height/2-40)
-				ebitenutil.DebugPrintAt(screen, "START NEXT WAVE!", x+width/2-45, y+height/2-8)
+				drawText(screen, "FINISH BUILDING!", x+width/2-45, y+height/2-40, 1, 1, color.RGBA{0xff, 0xff, 0xff, 0xff})
+				drawText(screen, "START NEXT WAVE!", x+width/2-45, y+height/2-8, 1, 1, color.RGBA{0xff, 0xff, 0xff, 0xff})
 				// 現在のウェーブとトータルウェーブ数を表示する
-				ebitenutil.DebugPrintAt(screen, fmt.Sprintf("CURRENT WAVE: %d/%d", h.game.waveCtrl.currentBigWave, len(waveList)), x+width/2-52, y+height/2+32)
+				drawText(screen, fmt.Sprintf("CURRENT WAVE: %d/%d", h.game.waveCtrl.currentBigWave+1, len(waveList)), x+width/2-52, y+height/2+32, 1, 1, color.RGBA{0xff, 0xff, 0xff, 0xff})
 			},
 		)
 		h.game.infoPanel.AddButton(nextWaveStartButton)

main.go

@@ -218,7 +218,7 @@ func (g *Game) initialize() {
 	g.drawHandler.Add(bg)
 
 	// クレジットを初期化
-	g.credit = 100
+	g.credit = 1000
 
 	// 敵が全滅したらウェーブを終了して建築フェーズに戻る
 	// 敵が全滅したことをコールバックする

radiotower.go

@@ -8,7 +8,6 @@ import (
 	"math"
 
 	"github.com/hajimehoshi/ebiten/v2"
-	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
 	"github.com/hajimehoshi/ebiten/v2/vector"
 
 	_ "embed"
@@ -272,10 +271,11 @@ func (b *radioTower) OnClick(x, y int) bool {
 	b.game.infoPanel.setIcon(icon)
 	b.game.infoPanel.setUnit(b)
 	b.game.infoPanel.drawDescriptionFn = func(screen *ebiten.Image, x, y int) {
-		ebitenutil.DebugPrintAt(screen, "I am Radio Tower!", x, y)
-		ebitenutil.DebugPrintAt(screen, fmt.Sprintf("Cost: $%d", b.Cost()), x, y+20)
+		var scale float64 = 2
 		// 範囲攻撃するしレンジも広いが、近くは攻撃できない
-		ebitenutil.DebugPrintAt(screen, "Attacks in an area, effective at range, but cannot hit nearby enemies.", x, y+40)
+		drawText(screen, "I am Radio Tower!", x, y-10, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
+		drawText(screen, fmt.Sprintf("Cost: $%d", b.Cost()), x, y+20, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
+		drawText(screen, "Attacks in area, cannot hit near bugs!", x, y+50, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
 	}
 	return false
 }

text.go

@@ -0,0 +1,24 @@
+package main
+
+import (
+	"image/color"
+
+	"github.com/hajimehoshi/bitmapfont/v3"
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/text/v2"
+)
+
+/*
+こんなふうに使う
+
+clr := color.RGBA{R: 0xff, G: 0xff, B: 0xff, A: 0xff}
+scaleX, scaleY = float64(5), float64(5)
+drawText(screen, "HOUSE DEFENSE OPERATION!", screenWidth-750, 100, scaleX, scaleY, clr)
+*/
+func drawText(screen *ebiten.Image, t string, x, y int, scaleX, scaleY float64, clr color.RGBA) {
+	textOp := &text.DrawOptions{}
+	textOp.ColorScale.ScaleWithColor(clr)
+	textOp.GeoM.Scale(scaleX, scaleY)
+	textOp.GeoM.Translate(float64(x), float64(y))
+	text.Draw(screen, t, text.NewGoXFace(bitmapfont.Face), textOp)
+}

title.go

@@ -6,9 +6,7 @@ import (
 	"image/color"
 	"log"
 
-	"github.com/hajimehoshi/bitmapfont/v3"
 	"github.com/hajimehoshi/ebiten/v2"
-	"github.com/hajimehoshi/ebiten/v2/text/v2"
 )
 
 type title struct {
@@ -136,19 +134,8 @@ func (t *title) Draw(screen *ebiten.Image) {
 	// 文字を描く
 	clr := color.RGBA{R: 0xff, G: 0xff, B: 0xff, 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)
-
+	drawText(screen, "HOUSE DEFENSE OPERATION!", screenWidth-750, 100, scaleX, scaleY, clr)
+	drawText(screen, "CLICK TO START!", screenWidth-750, 170, scaleX, scaleY, clr)
 }
 
 func (t *title) ZIndex() int {

tower.go

@@ -8,7 +8,6 @@ import (
 	"math"
 
 	"github.com/hajimehoshi/ebiten/v2"
-	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
 	"github.com/hajimehoshi/ebiten/v2/vector"
 
 	_ "embed"
@@ -254,10 +253,11 @@ func (b *tower) OnClick(x, y int) bool {
 	b.game.infoPanel.setIcon(icon)
 	b.game.infoPanel.setUnit(b)
 	b.game.infoPanel.drawDescriptionFn = func(screen *ebiten.Image, x, y int) {
-		ebitenutil.DebugPrintAt(screen, "I am Beam Tower!", x, y)
-		ebitenutil.DebugPrintAt(screen, fmt.Sprintf("Cost: $%d", b.Cost()), x, y+20)
+		var scale float64 = 2
 		// 敵を一匹ずつ攻撃するという説明を記載する
-		ebitenutil.DebugPrintAt(screen, "Attack single bug by laser beam!", x, y+40)
+		drawText(screen, "I am Beam Tower!", x, y-10, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
+		drawText(screen, fmt.Sprintf("Cost: $%d", b.Cost()), x, y+20, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
+		drawText(screen, "Attack single bug by laser beam!", x, y+50, scale, scale, color.RGBA{0xff, 0xff, 0xff, 0xff})
 	}
 
 	return false