Browse Source

turkeyy

Load_Fix
Robert Chen 11 years ago
parent
commit
0d0c2f127a
  1. 8
      js/main.js
  2. 13
      js/ui.js
  3. BIN
      res/people/.DS_Store
  4. BIN
      res/screens/.DS_Store
  5. BIN
      res/screens/KitchenScreen/.DS_Store
  6. BIN
      res/screens/KitchenScreen/KitchenScreenMockup.png
  7. 9554
      res/screens/KitchenScreen/TurkeyState1Test1.svg
  8. BIN
      res/screens/Window/.DS_Store

8
js/main.js

@ -73,10 +73,10 @@ function GameState(){
// Kitchen Items // Kitchen Items
queue.loadFile( {id: "res/screens/KitchenScreen/KitchenScreen.png", src:"res/screens/KitchenScreen/KitchenScreen.png"}); queue.loadFile( {id: "res/screens/KitchenScreen/KitchenScreen.png", src:"res/screens/KitchenScreen/KitchenScreen.png"});
queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState1Small.svg", src:"res/screens/KitchenScreen/TurkeyState1Small.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/TurkeyState2Small.svg", src:"res/screens/KitchenScreen/TurkeyState2Small.svg"});
queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState3.svg", src:"res/screens/KitchenScreen/TurkeyState3.svg"}); queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState3Small.svg", src:"res/screens/KitchenScreen/TurkeyState3Small.svg"});
queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState4.svg", src:"res/screens/KitchenScreen/TurkeyState4.svg"}); queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState4Small.svg", src:"res/screens/KitchenScreen/TurkeyState4Small.svg"});
queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState5.svg", src:"res/screens/KitchenScreen/TurkeyState5.svg"}); queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState5Small.svg", src:"res/screens/KitchenScreen/TurkeyState5Small.svg"});
queue.loadFile( {id: "res/screens/KitchenScreen/CookbookKitchenGlow.png", src:"res/screens/KitchenScreen/CookbookKitchenGlow.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"}); queue.loadFile( {id: "res/screens/KitchenScreen/CookbookKitchen.png", src:"res/screens/KitchenScreen/CookbookKitchen.png"});

13
js/ui.js

@ -118,10 +118,10 @@ function OvenUI( stage, gameState ){
var turkeyStates = [ var turkeyStates = [
new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState1Small.svg" ), new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState1Small.svg" ),
new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState2.svg" ), new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState2Small.svg" ),
new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState3.svg" ), new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState3Small.svg" ),
new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState4.svg" ), new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState4Small.svg" ),
new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState5.svg" ) new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState5Small.svg" )
]; ];
// place turkeys in oven // place turkeys in oven
for (i in turkeyStates){ for (i in turkeyStates){
@ -330,7 +330,10 @@ function OvenUI( stage, gameState ){
turkeyStates[4].alpha = turkeyState["skin"]["cond"][1]; turkeyStates[4].alpha = turkeyState["skin"]["cond"][1];
if( turkeyState["skin"]["cond"][0] == "House Fire" ) if( turkeyState["skin"]["cond"][0] == "House Fire" )
turkeyStates[4].alpha = 1; turkeyStates[4].alpha = 1;
for(i in turkeyStates){
stage.addChild(turkeyStates[i]);
}
} }
} }
}, },

BIN
res/people/.DS_Store vendored

Binary file not shown.

BIN
res/screens/.DS_Store vendored

Binary file not shown.

BIN
res/screens/KitchenScreen/.DS_Store vendored

Binary file not shown.

BIN
res/screens/KitchenScreen/KitchenScreenMockup.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 463 KiB

9554
res/screens/KitchenScreen/TurkeyState1Test1.svg

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 980 KiB

BIN
res/screens/Window/.DS_Store vendored

Binary file not shown.
Loading…
Cancel
Save