Fix particle FX and maintenance

Stop emitters on main menu when language notification is shown Remove unused sound files from loadSoundFX()
sekodev · May 23, 2023 · e506b13 · e506b13
1 parent a74071b
commit e506b13
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/screens/endScreen.lua b/screens/endScreen.lua
@@ -901,7 +901,7 @@ function scene:create( event )
 
  priceLockCoins = commonMethods.calculateLockPrice(priceLockCoins)
 
- local tableFileNames = { "answerChosen.wav", "answerRight.wav", "answerWrong.wav", "fireworks.wav", "lockQuestionSet.wav" }
+ local tableFileNames = { "answerChosen.wav", "answerRight.wav", "fireworks.wav", "lockQuestionSet.wav" }
  tableSoundFiles = utils.loadSoundFX(tableSoundFiles, "assets/soundFX/", tableFileNames)
 
  checkHighScore()

diff --git a/screens/menuScreen.lua b/screens/menuScreen.lua
@@ -733,6 +733,12 @@ end
 
 -- Close language notification box
 local function closeLanguageNotificationBox()
+ menuGroup.emitterFXLeft:start()
+ menuGroup.emitterFXRight:start()
+
+ transition.to( menuGroup.emitterFXLeft, { time = timeWaitChoice, alpha = 1 } )
+ transition.to( menuGroup.emitterFXRight, { time = timeWaitChoice, alpha = 1 } )
+
  utils.clearDisplayGroup(infoGroup)
 
  composer.setVariable( "isLanguageOptionShown", true )
@@ -785,7 +791,7 @@ function scene:create( event )
 
  priceLockCoins = commonMethods.calculateLockPrice(priceLockCoins)
 
- local tableFileNames = { "answerChosen.wav", "answerRight.wav", "answerWrong.wav", "lockQuestionSet.wav", "campfire.mp3" }
+ local tableFileNames = { "answerChosen.wav", "answerRight.wav", "lockQuestionSet.wav", "campfire.mp3" }
  tableSoundFiles = utils.loadSoundFX(tableSoundFiles, "assets/soundFX/", tableFileNames)
 
  createMenuElements()
@@ -838,6 +844,12 @@ function scene:show( event )
  local isLanguageOptionShown = composer.getVariable( "isLanguageOptionShown" )
 
  if (not isLanguageOptionShown) then
+ menuGroup.emitterFXLeft:stop()
+ menuGroup.emitterFXRight:stop()
+
+ transition.to( menuGroup.emitterFXLeft, { time = timeWaitChoice, alpha = 0 } )
+ transition.to( menuGroup.emitterFXRight, { time = timeWaitChoice, alpha = 0 } )
+
  -- Declare options for dialog box creation
  local optionsLanguageOptionBox = {
  fontDialog = fontLogo,

diff --git a/screens/settingScreen.lua b/screens/settingScreen.lua
@@ -502,7 +502,7 @@ function scene:create( event )
  menuGroup = display.newGroup( )
  resetGroup = display.newGroup( )
 
- local tableFileNames = { "answerChosen.wav", "answerRight.wav" }
+ local tableFileNames = { "answerChosen.wav" }
  tableSoundFiles = utils.loadSoundFX(tableSoundFiles, "assets/soundFX/", tableFileNames)
 
  createSettingsElements()