diff --git a/js/main.js b/js/main.js index c3d1127..47b1c3a 100755 --- a/js/main.js +++ b/js/main.js @@ -107,11 +107,11 @@ function GameState(){ // Kitchen Items queue.loadFile( {id: "res/screens/KitchenScreen/KitchenScreen.png", src:"res/screens/KitchenScreen/KitchenScreen.png"}); queue.loadFile( {id: "res/screens/KitchenScreen/FinalConfirmation.png", src:"res/screens/KitchenScreen/FinalConfirmation.png"}); - queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState1Small.svg", src:"res/screens/KitchenScreen/TurkeyState1Small.svg"}); - queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState2Small.svg", src:"res/screens/KitchenScreen/TurkeyState2Small.svg"}); - queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState3Small.svg", src:"res/screens/KitchenScreen/TurkeyState3Small.svg"}); - queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState4Small.svg", src:"res/screens/KitchenScreen/TurkeyState4Small.svg"}); - queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState5Small.svg", src:"res/screens/KitchenScreen/TurkeyState5Small.svg"}); + queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState1Small.png", src:"res/screens/KitchenScreen/TurkeyState1Small.png"}); + queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState2Small.png", src:"res/screens/KitchenScreen/TurkeyState2Small.png"}); + queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState3Small.png", src:"res/screens/KitchenScreen/TurkeyState3Small.png"}); + queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState4Small.png", src:"res/screens/KitchenScreen/TurkeyState4Small.png"}); + queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState5Small.png", src:"res/screens/KitchenScreen/TurkeyState5Small.png"}); queue.loadFile( {id: "res/screens/KitchenScreen/CookbookKitchenGlow.png", src:"res/screens/KitchenScreen/CookbookKitchenGlow.png"}); queue.loadFile( {id: "res/screens/KitchenScreen/CookbookKitchen.png", src:"res/screens/KitchenScreen/CookbookKitchen.png"}); @@ -245,7 +245,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/Test4TransparencyFull.svg", src:"res/screens/Window/Test4TransparencyFull.svg"}); + queue.loadFile( {id: "res/screens/Window/Test4TransparencyFull.png", src:"res/screens/Window/Test4TransparencyFull.png"}); @@ -282,11 +282,11 @@ function GameState(){ /* all turkeys */ this.turkeyStates = [ - new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState1Small.svg" ), - new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState2Small.svg" ), - new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState3Small.svg" ), - new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState4Small.svg" ), - new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState5Small.svg" ) + new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState1Small.png" ), + new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState2Small.png" ), + new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState3Small.png" ), + new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState4Small.png" ), + new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState5Small.png" ) ]; this.purchasedItems = []; diff --git a/js/ui.js b/js/ui.js index 7e1bba7..dbc4964 100755 --- a/js/ui.js +++ b/js/ui.js @@ -662,8 +662,8 @@ function OvenUI( stage, gameState ){ function WindowUI( stage, gameState ){ - var dayNight = new createjs.Bitmap("res/screens/Window/Test4-217.svg"); - var mood = new createjs.Bitmap("res/screens/Window/Test4TransparencyFull.svg"); + var dayNight = new createjs.Bitmap("res/screens/Window/Test4-217.png"); + var mood = new createjs.Bitmap("res/screens/Window/Test4TransparencyFull.png"); mood.y=30; dayNight.y=30; diff --git a/res/screens/KitchenScreen/TurkeyState1Small.png b/res/screens/KitchenScreen/TurkeyState1Small.png new file mode 100644 index 0000000..4dd364f Binary files /dev/null and b/res/screens/KitchenScreen/TurkeyState1Small.png differ diff --git a/res/screens/KitchenScreen/TurkeyState2Small.png b/res/screens/KitchenScreen/TurkeyState2Small.png new file mode 100644 index 0000000..277e17e Binary files /dev/null and b/res/screens/KitchenScreen/TurkeyState2Small.png differ diff --git a/res/screens/KitchenScreen/TurkeyState3Small.png b/res/screens/KitchenScreen/TurkeyState3Small.png new file mode 100644 index 0000000..4109697 Binary files /dev/null and b/res/screens/KitchenScreen/TurkeyState3Small.png differ diff --git a/res/screens/KitchenScreen/TurkeyState4Small.png b/res/screens/KitchenScreen/TurkeyState4Small.png new file mode 100644 index 0000000..27310f9 Binary files /dev/null and b/res/screens/KitchenScreen/TurkeyState4Small.png differ diff --git a/res/screens/KitchenScreen/TurkeyState5Small.png b/res/screens/KitchenScreen/TurkeyState5Small.png new file mode 100644 index 0000000..1549372 Binary files /dev/null and b/res/screens/KitchenScreen/TurkeyState5Small.png differ diff --git a/res/screens/Window/Test4-217.png b/res/screens/Window/Test4-217.png new file mode 100644 index 0000000..0724b74 Binary files /dev/null and b/res/screens/Window/Test4-217.png differ diff --git a/res/screens/Window/Test4TransparencyFull.png b/res/screens/Window/Test4TransparencyFull.png new file mode 100644 index 0000000..e49f0f1 Binary files /dev/null and b/res/screens/Window/Test4TransparencyFull.png differ