sciuro
/
Turkey-Cooking-Simulator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

More changes

Load_Fix
Robert Chen 11 years ago
parent
54612d3435
commit
6743f51420
9 changed files with 10 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      js/dialogue.js
  2. 4
      js/main.js
  3. 10
      js/ui.js
  4. 25
      res/Test4-217.svg
  5. BIN
      res/people/.DS_Store
  6. BIN
      res/people/TurkeyGhost.png
  7. BIN
      res/screens/.DS_Store
  8. BIN
      res/screens/KitchenScreen/.DS_Store
  9. BIN
      res/screens/Window/.DS_Store

3
js/dialogue.js
Unescape View File

@ -30,7 +30,8 @@ function DialogUI( stage, gameState ){
"Grandpa": new createjs.Bitmap("res/people/Grandpa.png"), "Grandpa": new createjs.Bitmap("res/people/Grandpa.png"),
"Mom": new createjs.Bitmap("res/people/Mom.png"), "Mom": new createjs.Bitmap("res/people/Mom.png"),
"Female": new createjs.Bitmap("res/people/PlayerFemale.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); var dialogueList = Object.keys(story);

4
js/main.js
Unescape View File

@ -200,6 +200,7 @@ function GameState(){
queue.loadFile( {id: "res/people/Mom.png", src:"res/people/Mom.png"}); 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/PlayerFemale.png", src:"res/people/PlayerFemale.png"});
queue.loadFile( {id: "res/people/PlayerMale.png", src:"res/people/PlayerMale.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 // Load Window elements
queue.loadFile( {id: "res/screens/Window/Door1.png", src:"res/screens/Window/Door1.png"}); 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/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/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/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/Test4TransparencyFull.svg", src:"res/screens/Window/Test4TransparencyFull.svg"});
queue.loadFile( {id: "res/screens/Window/Test4-217.png", src:"res/screens/Window/Test4TransparencyFull.png"});

10
js/ui.js
Unescape View File

@ -133,6 +133,7 @@ function FinalConfirmationUI(stage, gameState){
// Show core temperature // Show core temperature
this.showFinalConfirm = function(){ this.showFinalConfirm = function(){
console.log("Showing final confirm");
if( !that.showingConfirm ){ if( !that.showingConfirm ){
stage.addChild( finalImg ); stage.addChild( finalImg );
stage.addChild( noButton ); stage.addChild( noButton );
@ -528,8 +529,7 @@ function WindowUI( stage, gameState ){
dayNight.y=30; dayNight.y=30;
var secondCounter = 0; var secondCounter = 0;
dayNight.x = -(new Date( gameState.currentTime ).getHours()*682.625); mood.x = dayNight.x = -(new Date( gameState.currentTime ).getHours()*682.625);
mood.x = -(new Date( gameState.currentTime ).getHours()*682.625);
var ground = new createjs.Bitmap( "res/screens/Window/Ground.png" ); var ground = new createjs.Bitmap( "res/screens/Window/Ground.png" );
var houses = new createjs.Bitmap( "res/screens/Window/Housefar.png" ); var houses = new createjs.Bitmap( "res/screens/Window/Housefar.png" );
@ -550,7 +550,7 @@ function WindowUI( stage, gameState ){
// Fast forward, move sky // Fast forward, move sky
gameState.pubsub.subscribe( "SkipTime", function(){ gameState.pubsub.subscribe( "SkipTime", function(){
var newpos = -(new Date( gameState.currentTime ).getHours()*682.625); 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 ); stage.addChild( dayNight );
@ -567,11 +567,13 @@ return {
secondCounter++; secondCounter++;
if( secondCounter > 60 ){ if( secondCounter > 60 ){
dayNight.x-=11.38; dayNight.x-=11.38;
mood.x -= 11.38;
secondCounter = 0; secondCounter = 0;
} }
// move the overlay // move the overlay
//console.log(dayNight.x); console.log("Mood"+mood.x);
if( dayNight.x < -15583 ) if( dayNight.x < -15583 )
dayNight.x = 0; dayNight.x = 0;

25
res/Test4-217.svg
Unescape View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="16383px" height="217px" viewBox="0 0 16383 217" enable-background="new 0 0 16383 217" xml:space="preserve">
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="2320.925" y1="108.5" x2="13382.874" y2="108.5">
<stop offset="0" style="stop-color:#000000"/>
<stop offset="0.202" style="stop-color:#09152A"/>
<stop offset="0.2857" style="stop-color:#395568"/>
<stop offset="0.3385" style="stop-color:#8AC5D5"/>
<stop offset="0.3892" style="stop-color:#BCE4E7"/>
<stop offset="0.4286" style="stop-color:#E0F2F2"/>
<stop offset="0.4729" style="stop-color:#EAF6F7"/>
<stop offset="0.5025" style="stop-color:#F5F6E8"/>
<stop offset="0.6059" style="stop-color:#F3F8E8"/>
<stop offset="0.6502" style="stop-color:#F7F7D3"/>
<stop offset="0.6995" style="stop-color:#F3F4C4"/>
<stop offset="0.7244" style="stop-color:#F2E3B8"/>
<stop offset="0.7488" style="stop-color:#EAD985"/>
<stop offset="0.7768" style="stop-color:#F7D94C"/>
<stop offset="0.8087" style="stop-color:#D5A825"/>
<stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" width="16383" height="217"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
res/people/.DS_Store vendored
View File

Binary file not shown.

BIN
res/people/TurkeyGhost.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 56 KiB

BIN
res/screens/.DS_Store vendored
View File

Binary file not shown.

BIN
res/screens/KitchenScreen/.DS_Store vendored
View File

Binary file not shown.

BIN
res/screens/Window/.DS_Store vendored
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save