From 6cf4a0143d702d41ec26e9728a0eab346f32a7e8 Mon Sep 17 00:00:00 2001 From: MrDonuts Date: Tue, 28 Nov 2023 21:11:07 -0500 Subject: [PATCH] added mp3 functionality fixed bug where last move on correct square didn't register --- .DS_Store | Bin 6148 -> 6148 bytes assets/.DS_Store | Bin 6148 -> 6148 bytes assets/audio.go | 33 ++++++++++++++++++++++++++++++++- assets/audio/portal.mp3 | Bin 0 -> 3715 bytes go.mod | 4 +++- go.sum | 6 ++++++ states/playLevelState.go | 10 +++++++--- 7 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 assets/audio/portal.mp3 diff --git a/.DS_Store b/.DS_Store index 0e9888099fa5e49d39f3ae2e490b502d4dce2b19..64d52257db3b8307f6985be99404497a6f28847f 100644 GIT binary patch delta 46 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 GEB*^AN4Ez6 literal 0 HcmV?d00001 diff --git a/go.mod b/go.mod index 27d9081..b5a59cd 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,9 @@ module src.robn.tv/MrDonuts/RGB go 1.21.3 -require github.com/hajimehoshi/ebiten/v2 v2.6.2 +require github.com/hajimehoshi/ebiten/v2 v2.6.3 + +require github.com/hajimehoshi/go-mp3 v0.3.4 // indirect require ( github.com/ebitengine/oto/v3 v3.1.0 // indirect diff --git a/go.sum b/go.sum index 45fbaa3..a534d42 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,11 @@ github.com/hajimehoshi/bitmapfont/v3 v3.0.0 h1:r2+6gYK38nfztS/et50gHAswb9hXgxXEC github.com/hajimehoshi/bitmapfont/v3 v3.0.0/go.mod h1:+CxxG+uMmgU4mI2poq944i3uZ6UYFfAkj9V6WqmuvZA= github.com/hajimehoshi/ebiten/v2 v2.6.2 h1:tVa3ZJbp4Uz/VSjmpgtQIOvwd7aQH290XehHBLr2iWk= github.com/hajimehoshi/ebiten/v2 v2.6.2/go.mod h1:TZtorL713an00UW4LyvMeKD8uXWnuIuCPtlH11b0pgI= +github.com/hajimehoshi/ebiten/v2 v2.6.3 h1:xJ5klESxhflZbPUx3GdIPoITzgPgamsyv8aZCVguXGI= +github.com/hajimehoshi/ebiten/v2 v2.6.3/go.mod h1:TZtorL713an00UW4LyvMeKD8uXWnuIuCPtlH11b0pgI= +github.com/hajimehoshi/go-mp3 v0.3.4 h1:NUP7pBYH8OguP4diaTZ9wJbUbk3tC0KlfzsEpWmYj68= +github.com/hajimehoshi/go-mp3 v0.3.4/go.mod h1:fRtZraRFcWb0pu7ok0LqyFhCUrPeMsGRSVop0eemFmo= +github.com/hajimehoshi/oto/v2 v2.3.1/go.mod h1:seWLbgHH7AyUMYKfKYT9pg7PhUu9/SisyJvNTT+ASQo= github.com/jezek/xgb v1.1.0 h1:wnpxJzP1+rkbGclEkmwpVFQWpuE2PUGNUzP8SbfFobk= github.com/jezek/xgb v1.1.0/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk= golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63 h1:3AGKexOYqL+ztdWdkB1bDwXgPBuTS/S8A4WzuTvJ8Cg= @@ -16,6 +21,7 @@ golang.org/x/mobile v0.0.0-20230922142353-e2f452493d57 h1:Q6NT8ckDYNcwmi/bmxe+Xb golang.org/x/mobile v0.0.0-20230922142353-e2f452493d57/go.mod h1:wEyOn6VvNW7tcf+bW/wBz1sehi2s2BZ4TimyR7qZen4= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/states/playLevelState.go b/states/playLevelState.go index a9eb6b5..075b27b 100644 --- a/states/playLevelState.go +++ b/states/playLevelState.go @@ -49,9 +49,7 @@ func (s *PlayLevelState) Update() { } geom.MainPlayer.Update() - if geom.CurrentEnergy == 0 { - SM.Transition("game over") - } + if geom.GameGrid.ColouredSquaresRemaining() == 0 { //go to next level newRowSize := min(rand.Intn(5+geom.CurrentLevel)+2, geom.MaxGridDimension) @@ -60,6 +58,12 @@ func (s *PlayLevelState) Update() { SM.Transition("load") assets.SFXLibrary["newLevel"].Rewind() assets.SFXLibrary["newLevel"].Play() + return + } + + if geom.CurrentEnergy == 0 { + SM.Transition("game over") + return } }