diff --git a/js/main.js b/js/main.js index d6d6dd0..b680f16 100644 --- a/js/main.js +++ b/js/main.js @@ -92,11 +92,9 @@ function GameState(){ // Load sound assets queue.loadFile( {id: "TitleMusicFile", src:"res/sound/turkey_in_the_straw.mp3"} ); - queue.loadFile( {id: "MarketBackgroundSoundFile", src:"res/sound/Store/supermarket.mp3"} ); queue.loadFile( {id: "MarketSoundFile", src:"res/sound/Store/Waterford.mp3"} ); // UI sounds - queue.loadFile( {id: "UIPopFile", src:"res/sound/GUI/pop.mp3"} ); queue.loadFile( {id: "UILowClickFile", src:"res/sound/GUI/lowclick.mp3"} ); queue.loadFile( {id: "UIClickFile", src:"res/sound/GUI/click.mp3"} ); queue.loadFile( {id: "UIBuzzFile", src:"res/sound/GUI/buzz.mp3"} ); diff --git a/js/screens.js b/js/screens.js index a74716a..f349a53 100644 --- a/js/screens.js +++ b/js/screens.js @@ -272,7 +272,7 @@ function KitchenScreen( stage, gameState ){ // If player did not buy a turkey, tell them if( !gameState.turkeyBought ){ - gameState.pubsub.publish( "ShowDialog", {seq:"KitchenInitial", autoAdvance:true} ); + gameState.pubsub.publish( "ShowDialog", {seq:"KitchenInitial", autoAdvance:false} ); } return { diff --git a/js/soundmanager.js b/js/soundmanager.js index 6248fce..856316d 100644 --- a/js/soundmanager.js +++ b/js/soundmanager.js @@ -13,9 +13,7 @@ function SoundManager( gameState ){ // Register all sounds loaded in gameState createjs.Sound.registerSound("res/sound/turkey_in_the_straw.mp3", "TitleMusic"); - createjs.Sound.registerSound("res/sound/Store/supermarket.mp3", "MarketBackgroundSound"); createjs.Sound.registerSound("res/sound/Store/Waterford.mp3", "MarketMusic"); - createjs.Sound.registerSound("res/sound/GUI/pop.mp3", "Pop"); createjs.Sound.registerSound("res/sound/GUI/lowclick.mp3", "LowClick"); createjs.Sound.registerSound("res/sound/GUI/click.mp3", "Click"); createjs.Sound.registerSound("res/sound/GUI/buzz.mp3", "Error"); @@ -43,7 +41,7 @@ function SoundManager( gameState ){ } }; this.play = function( soundName ){ - var channel = createjs.Sound.createInstance("Pop"); + var channel = createjs.Sound.createInstance("Click"); if( typeof soundName != "object" ){ channel = ( soundCache[soundName] ? soundCache[soundName] : soundCache[soundName] = createjs.Sound.createInstance(soundName) );