diff --git a/js/model.js b/js/model.js index 3bc02ea..a31dd8d 100755 --- a/js/model.js +++ b/js/model.js @@ -75,7 +75,7 @@ function OvenModel( turkeyWeight, gameState ) { this.steadyTimer = 0; this.globalTime = 0; - var turkey = new TurkeyModel(9.07185, this ); + var turkey = new TurkeyModel( UtilityFunctions.lbs2kgs(turkeyWeight), this ); var proportional = 0.004; // This value is arbitrary to how fast you want the temperatures to converge. (Or oscillate, which could be realistic as well) var errorTolerance = 10; //Stove is accurate to 1 degree Celcius Should hopefully oscillate below that value. diff --git a/js/ui.js b/js/ui.js index 4b25980..56b1513 100755 --- a/js/ui.js +++ b/js/ui.js @@ -741,9 +741,9 @@ function WindowUI( stage, gameState ){ var ground = new createjs.Bitmap( "res/screens/Window/Ground.png" ); var houses = new createjs.Bitmap( "res/screens/Window/Housefar.png" ); var streetLight = new createjs.Bitmap( "res/screens/Window/StreetlightGlow.png" ); - streetLight.alpha = 0; + streetLight.alpha = 1; var stars = new createjs.Bitmap( "res/screens/Window/Stars.png" ); - stars.alpha = 0; + stars.alpha = 1; var treeAnimations = { rustle:{ frames:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17], next:false } }; var data = {