diff --git a/assets/magic.wav b/assets/magic.wav index 96de515..0de9b99 100644 Binary files a/assets/magic.wav and b/assets/magic.wav differ diff --git a/fonts/fonts.go b/fonts/fonts.go index b530647..dd040c8 100644 --- a/fonts/fonts.go +++ b/fonts/fonts.go @@ -12,13 +12,14 @@ import ( ) const ( - FontDPI = 72 - FontSizeStandard = 16 - FontSizeLarge = 24 - FontSizeBig = 60 - FontSizeArcade = 12 - FontSizeArcadeBig = 40 - FontSizeArcadeHuge = 80 + FontDPI = 72 + FontSizeStandard = 16 + FontSizeLarge = 24 + FontSizeBig = 60 + FontSizeArcadeSmall = 8 + FontSizeArcade = 12 + FontSizeArcadeBig = 40 + FontSizeArcadeHuge = 80 ) type FontStruct struct { @@ -29,6 +30,7 @@ type FontStruct struct { Arcade font.Face ArcadeLarge font.Face ArcadeHuge font.Face + ArcadeSmall font.Face } var ( @@ -82,4 +84,5 @@ func init() { SurviveFont.Arcade = GetFaceFatal(fnt3, FontDPI, FontSizeArcade) SurviveFont.ArcadeLarge = GetFaceFatal(fnt3, FontDPI, FontSizeArcadeBig) SurviveFont.ArcadeHuge = GetFaceFatal(fnt3, FontDPI, FontSizeArcadeHuge) + SurviveFont.ArcadeSmall = GetFaceFatal(fnt3, FontDPI, FontSizeArcadeSmall) } diff --git a/screenmanager/manager.go b/screenmanager/manager.go index 30ace81..fb4e958 100644 --- a/screenmanager/manager.go +++ b/screenmanager/manager.go @@ -26,7 +26,7 @@ func NewManager() Manager { return Manager{ Info: gamedata.GameInfo{ Name: "survive", - Version: "0.16", + Version: "0.18", Dimensions: gamedata.Area{ Width: defaultWidth, Height: defaultHeight, diff --git a/screens/game.go b/screens/game.go index 4250989..67cb897 100644 --- a/screens/game.go +++ b/screens/game.go @@ -505,7 +505,7 @@ func (g *Game) HandleInput() { } //account for controller sensitivity - if !g.gameover { + if !g.gameover && !g.Paused { xaxis := ebiten.StandardGamepadAxisValue(0, ebiten.StandardGamepadAxisRightStickHorizontal) yaxis := ebiten.StandardGamepadAxisValue(0, ebiten.StandardGamepadAxisRightStickVertical) @@ -544,8 +544,8 @@ func (g *Game) ConstructBackground() { g.background = ebiten.NewImage(g.dimensions.Width, g.dimensions.Height) BLOCK_SIZE := 32 - for i := 0; i < 640/16; i++ { - for j := 0; j < 480/16; j++ { + for i := 0; i < 640/BLOCK_SIZE; i++ { + for j := 0; j < 480/BLOCK_SIZE; j++ { //select random tile in x and y from tileset idx_y := rand.IntN(256 / BLOCK_SIZE) @@ -558,7 +558,7 @@ func (g *Game) ConstructBackground() { //translate for grid element we're painting op := &ebiten.DrawImageOptions{} - op.GeoM.Translate(float64(i)*16, float64(j)*16) + op.GeoM.Translate(float64(i*BLOCK_SIZE), float64(j*BLOCK_SIZE)) g.background.DrawImage(assets.ImageBank[assets.TileSet].SubImage(image.Rect(x0, y0, x1, y1)).(*ebiten.Image), op) } } diff --git a/screens/start.go b/screens/start.go index 6a6df84..41e0209 100644 --- a/screens/start.go +++ b/screens/start.go @@ -70,6 +70,8 @@ func (s *StartScreen) Draw(screen *ebiten.Image) { text.Draw(screen, "press start", fonts.SurviveFont.Arcade, 640/2-25, 300, color.White) } + text.Draw(screen, "©bsoft games", fonts.SurviveFont.ArcadeSmall, 640/2+25, 180, color.White) + } func (s *StartScreen) SetEventHandler(e ScreenManagerEvent, f func()) {