diff --git a/js/dialogue.js b/js/dialogue.js index 9b043e5..294ee8e 100644 --- a/js/dialogue.js +++ b/js/dialogue.js @@ -30,7 +30,8 @@ function DialogUI( stage, gameState ){ "Grandpa": new createjs.Bitmap("res/people/Grandpa.png"), "Mom": new createjs.Bitmap("res/people/Mom.png"), "Female": new createjs.Bitmap("res/people/PlayerFemale.png"), - "Male": new createjs.Bitmap("res/people/PlayerMale.png") + "Male": new createjs.Bitmap("res/people/PlayerMale.png"), + "Turkey": new createjs.Bitmap("res/people/TurkeyGhost.png") }; var dialogueList = Object.keys(story); diff --git a/js/main.js b/js/main.js index 132f8f3..d2ed9a7 100644 --- a/js/main.js +++ b/js/main.js @@ -200,6 +200,7 @@ function GameState(){ queue.loadFile( {id: "res/people/Mom.png", src:"res/people/Mom.png"}); queue.loadFile( {id: "res/people/PlayerFemale.png", src:"res/people/PlayerFemale.png"}); queue.loadFile( {id: "res/people/PlayerMale.png", src:"res/people/PlayerMale.png"}); + queue.loadFile( {id: "res/people/TurkeyGhost.png", src:"res/people/TurkeyGhost.png"}); // Load Window elements queue.loadFile( {id: "res/screens/Window/Door1.png", src:"res/screens/Window/Door1.png"}); @@ -224,8 +225,7 @@ function GameState(){ queue.loadFile( {id: "res/screens/Window/Win10.png", src:"res/screens/Window/Win10.png"}); queue.loadFile( {id: "res/screens/Window/Win11.png", src:"res/screens/Window/Win11.png"}); queue.loadFile( {id: "res/screens/Window/Tree_Animation.png", src:"res/screens/Window/Tree_Animation.png"}); - queue.loadFile( {id: "res/screens/Window/Test4-217.png", src:"res/screens/Window/Test4-217.png"}); - queue.loadFile( {id: "res/screens/Window/Test4-217.png", src:"res/screens/Window/Test4TransparencyFull.png"}); + queue.loadFile( {id: "res/screens/Window/Test4TransparencyFull.svg", src:"res/screens/Window/Test4TransparencyFull.svg"}); diff --git a/js/ui.js b/js/ui.js index 0132bca..d3948f2 100644 --- a/js/ui.js +++ b/js/ui.js @@ -133,6 +133,7 @@ function FinalConfirmationUI(stage, gameState){ // Show core temperature this.showFinalConfirm = function(){ + console.log("Showing final confirm"); if( !that.showingConfirm ){ stage.addChild( finalImg ); stage.addChild( noButton ); @@ -528,8 +529,7 @@ function WindowUI( stage, gameState ){ dayNight.y=30; var secondCounter = 0; - dayNight.x = -(new Date( gameState.currentTime ).getHours()*682.625); - mood.x = -(new Date( gameState.currentTime ).getHours()*682.625); + mood.x = dayNight.x = -(new Date( gameState.currentTime ).getHours()*682.625); var ground = new createjs.Bitmap( "res/screens/Window/Ground.png" ); var houses = new createjs.Bitmap( "res/screens/Window/Housefar.png" ); @@ -550,7 +550,7 @@ function WindowUI( stage, gameState ){ // Fast forward, move sky gameState.pubsub.subscribe( "SkipTime", function(){ var newpos = -(new Date( gameState.currentTime ).getHours()*682.625); - mood.x = dayNight.x = newpos < -15583 ? 0 : newpos; + dayNight.x = mood.x =newpos < -15583 ? 0 : newpos; }); stage.addChild( dayNight ); @@ -567,11 +567,13 @@ return { secondCounter++; if( secondCounter > 60 ){ dayNight.x-=11.38; + mood.x -= 11.38; secondCounter = 0; } // move the overlay - //console.log(dayNight.x); + console.log("Mood"+mood.x); + if( dayNight.x < -15583 ) dayNight.x = 0; diff --git a/res/Test4-217.svg b/res/Test4-217.svg deleted file mode 100644 index a19361e..0000000 --- a/res/Test4-217.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/people/.DS_Store b/res/people/.DS_Store index 78752a2..3da3d7e 100644 Binary files a/res/people/.DS_Store and b/res/people/.DS_Store differ diff --git a/res/people/TurkeyGhost.png b/res/people/TurkeyGhost.png new file mode 100644 index 0000000..167ba06 Binary files /dev/null and b/res/people/TurkeyGhost.png differ diff --git a/res/screens/.DS_Store b/res/screens/.DS_Store index 6f3c682..4efc9e6 100644 Binary files a/res/screens/.DS_Store and b/res/screens/.DS_Store differ diff --git a/res/screens/KitchenScreen/.DS_Store b/res/screens/KitchenScreen/.DS_Store index f17e463..cc5061b 100644 Binary files a/res/screens/KitchenScreen/.DS_Store and b/res/screens/KitchenScreen/.DS_Store differ diff --git a/res/screens/Window/.DS_Store b/res/screens/Window/.DS_Store index 1d32e10..a62f132 100644 Binary files a/res/screens/Window/.DS_Store and b/res/screens/Window/.DS_Store differ