From 478456884135b68d51c4a1b59afbc820e51005cc Mon Sep 17 00:00:00 2001 From: Robert Chen Date: Fri, 29 Nov 2013 16:19:58 -0800 Subject: [PATCH] turkeyy --- js/main.js | 2 +- js/ui.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/main.js b/js/main.js index 3209711..3a6d29b 100644 --- a/js/main.js +++ b/js/main.js @@ -72,7 +72,7 @@ function GameState(){ // Kitchen Items queue.loadFile( {id: "res/screens/KitchenScreen/KitchenScreen.png", src:"res/screens/KitchenScreen/KitchenScreen.png"}); - queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState1.svg", src:"res/screens/KitchenScreen/TurkeyState1.svg"}); + queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState1Small.svg", src:"res/screens/KitchenScreen/TurkeyState1Small.svg"}); queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState2.svg", src:"res/screens/KitchenScreen/TurkeyState2.svg"}); queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState3.svg", src:"res/screens/KitchenScreen/TurkeyState3.svg"}); queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState4.svg", src:"res/screens/KitchenScreen/TurkeyState4.svg"}); diff --git a/js/ui.js b/js/ui.js index 1ce184f..7b79476 100644 --- a/js/ui.js +++ b/js/ui.js @@ -117,7 +117,7 @@ function OvenUI( stage, gameState ){ } var turkeyStates = [ - new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState1.svg" ), + new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState1Small.svg" ), new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState2.svg" ), new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState3.svg" ), new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState4.svg" ), @@ -126,7 +126,7 @@ function OvenUI( stage, gameState ){ // place turkeys in oven for (i in turkeyStates){ turkeyStates[i].alpha = 0; - turkeyStates[i].scaleX = turkeyStates[i].scaleY = 0.2; + turkeyStates[i].scaleX = turkeyStates[i].scaleY =1; turkeyStates[i].x = 75; turkeyStates[i].y = 258; } @@ -360,6 +360,7 @@ function OvenUI( stage, gameState ){ turkeyStates[4].alpha = 1; panFront.alpha = 1; + stage.addChild(turkeyStates[0]); /*for(i in turkeyStates){ stage.addChild(turkeyStates[i]);