From de73c8fc8fee9fe75e39c2a6968bb4a718aec286 Mon Sep 17 00:00:00 2001 From: jenreiher Date: Sat, 28 Nov 2015 11:46:06 -0800 Subject: [PATCH 1/8] Update game.js --- js/game.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/game.js b/js/game.js index 0b0117e..6d6ea0d 100644 --- a/js/game.js +++ b/js/game.js @@ -35,6 +35,7 @@ var hero = { }; var monster = {}; var monstersCaught = 0; +var monstersNum = 0; // Handle keyboard controls var keysDown = {}; @@ -80,6 +81,7 @@ var update = function (modifier) { && monster.y <= (hero.y + 32) ) { ++monstersCaught; + ++monstersNum; reset(); } }; @@ -103,7 +105,8 @@ var render = function () { ctx.font = "24px Helvetica"; ctx.textAlign = "left"; ctx.textBaseline = "top"; - ctx.fillText("Goblins caught: " + monstersCaught, 32, 32); + ctx.fillText("Goblins caught: " + monstersCaught, 32, 32 + ctx.fillText("Goblins total: " + monstersNum, 62, 32); }; // The main game loop From dfaadf89200e36af8abc0eb311e4131ee78d8a86 Mon Sep 17 00:00:00 2001 From: jenreiher Date: Sat, 28 Nov 2015 15:19:08 -0800 Subject: [PATCH 2/8] Update game.js --- js/game.js | 76 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/js/game.js b/js/game.js index 6d6ea0d..6220d6c 100644 --- a/js/game.js +++ b/js/game.js @@ -33,9 +33,15 @@ monsterImage.src = "images/monster.png"; var hero = { speed: 256 // movement in pixels per second }; -var monster = {}; + var monstersCaught = 0; -var monstersNum = 0; +var monstersNum = 1; +var monster = [ + {'monsterName': 'monster1', + 'x' : 50, + 'y': 100 + } +]; // Handle keyboard controls var keysDown = {}; @@ -53,9 +59,38 @@ var reset = function () { hero.x = canvas.width / 2; hero.y = canvas.height / 2; - // Throw the monster somewhere on the screen randomly - monster.x = 32 + (Math.random() * (canvas.width - 64)); - monster.y = 32 + (Math.random() * (canvas.height - 64)); + for (var i = 1; i <= monstersNum; i++) { + console.log ("monster number = " + monstersNum) + // Push monster x, y to array + console.log ("i= " + i) + monster.push( + "monster" + i, +monster.x = 32 + (Math.random() * (canvas.width - 64)), + monster.y = 32 + (Math.random() * (canvas.height - 64))); + console.log("print array: " + monster) + } +monstersNum=monstersNum*2; +}; + +// Draw everything +var render = function () { + if (bgReady) { + ctx.drawImage(bgImage, 0, 0); + } + if (heroReady) { + ctx.drawImage(heroImage, hero.x, hero.y); + } + if (monsterReady) { + ctx.drawImage(monsterImage, monster[0].x, monster[0].y); + } + + // Score + ctx.fillStyle = "rgb(250, 250, 250)"; + ctx.font = "24px Helvetica"; + ctx.textAlign = "left"; + ctx.textBaseline = "top"; + ctx.fillText("Goblins caught: " + monstersCaught, 32, 32) + ctx.fillText("Goblins total: " + monstersNum, 32, 62); }; // Update game objects @@ -75,39 +110,16 @@ var update = function (modifier) { // Are they touching? if ( - hero.x <= (monster.x + 32) - && monster.x <= (hero.x + 32) - && hero.y <= (monster.y + 32) - && monster.y <= (hero.y + 32) + hero.x <= (monster[0].x + 32) + && monster[0].x <= (hero.x + 32) + && hero.y <= (monster[0].y + 32) + && monster[0].y <= (hero.y + 32) ) { ++monstersCaught; - ++monstersNum; reset(); } }; -// Draw everything -var render = function () { - if (bgReady) { - ctx.drawImage(bgImage, 0, 0); - } - - if (heroReady) { - ctx.drawImage(heroImage, hero.x, hero.y); - } - - if (monsterReady) { - ctx.drawImage(monsterImage, monster.x, monster.y); - } - - // Score - ctx.fillStyle = "rgb(250, 250, 250)"; - ctx.font = "24px Helvetica"; - ctx.textAlign = "left"; - ctx.textBaseline = "top"; - ctx.fillText("Goblins caught: " + monstersCaught, 32, 32 - ctx.fillText("Goblins total: " + monstersNum, 62, 32); -}; // The main game loop var main = function () { From ffd0dd4f4fbfe17915eaf77018e6453ecf8d0bcb Mon Sep 17 00:00:00 2001 From: jenreiher Date: Sat, 28 Nov 2015 15:31:47 -0800 Subject: [PATCH 3/8] Create game.js --- js/game.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/game.js b/js/game.js index 6220d6c..0f0605b 100644 --- a/js/game.js +++ b/js/game.js @@ -81,7 +81,7 @@ var render = function () { ctx.drawImage(heroImage, hero.x, hero.y); } if (monsterReady) { - ctx.drawImage(monsterImage, monster[0].x, monster[0].y); + ctx.drawImage(monsterImage, monster.x, monster.y); } // Score @@ -110,10 +110,10 @@ var update = function (modifier) { // Are they touching? if ( - hero.x <= (monster[0].x + 32) - && monster[0].x <= (hero.x + 32) - && hero.y <= (monster[0].y + 32) - && monster[0].y <= (hero.y + 32) + hero.x <= (monster.x + 32) + && monster.x <= (hero.x + 32) + && hero.y <= (monster.y + 32) + && monster.y <= (hero.y + 32) ) { ++monstersCaught; reset(); From 55becaf20a6077860f1ef32f5df7b3116d39be77 Mon Sep 17 00:00:00 2001 From: Melody Date: Sat, 28 Nov 2015 16:30:29 -0800 Subject: [PATCH 4/8] Update game.js --- js/game.js | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/js/game.js b/js/game.js index 0f0605b..601c587 100644 --- a/js/game.js +++ b/js/game.js @@ -29,16 +29,25 @@ monsterImage.onload = function () { }; monsterImage.src = "images/monster.png"; +// Squirrel image +var squirrelReady = false; +var squirrelImage = new Image(); +squirrelImage.onload = function () { + squirrelReady = true; +}; +squirrelImage.src = "images/squirrel.png"; + // Game objects var hero = { speed: 256 // movement in pixels per second }; - +var squirrel = {}; + var monstersCaught = 0; var monstersNum = 1; var monster = [ - {'monsterName': 'monster1', - 'x' : 50, + {'monsterName': 'monster1', + 'x' : 50, 'y': 100 } ]; @@ -59,6 +68,10 @@ var reset = function () { hero.x = canvas.width / 2; hero.y = canvas.height / 2; + // Throw the squirrel somewhere on the screen randomly + squirrel.x = 32 + (Math.random() * (canvas.width - 64)); + squirrel.y = 32 + (Math.random() * (canvas.height - 64)); + for (var i = 1; i <= monstersNum; i++) { console.log ("monster number = " + monstersNum) // Push monster x, y to array @@ -81,9 +94,11 @@ var render = function () { ctx.drawImage(heroImage, hero.x, hero.y); } if (monsterReady) { - ctx.drawImage(monsterImage, monster.x, monster.y); + ctx.drawImage(monsterImage, monster.x, monster.y); + } + if (squirrelReady) { + ctx.drawImage(squirrelImage, squirrel.x, squirrel.y); } - // Score ctx.fillStyle = "rgb(250, 250, 250)"; ctx.font = "24px Helvetica"; From 1e67479fad05b83b0beba31fa549e09a1a92cd59 Mon Sep 17 00:00:00 2001 From: jenreiher Date: Sat, 28 Nov 2015 16:54:42 -0800 Subject: [PATCH 5/8] Update game.js --- js/game.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/js/game.js b/js/game.js index 601c587..8efbc6e 100644 --- a/js/game.js +++ b/js/game.js @@ -93,9 +93,11 @@ var render = function () { if (heroReady) { ctx.drawImage(heroImage, hero.x, hero.y); } - if (monsterReady) { - ctx.drawImage(monsterImage, monster.x, monster.y); - } + for (var i = 0, len = monster.length; i < len; i++) { + if (monsterReady) { + ctx.drawImage(monsterImage, monster[i][0], monster[i][1]); + } + if (squirrelReady) { ctx.drawImage(squirrelImage, squirrel.x, squirrel.y); } @@ -124,18 +126,19 @@ var update = function (modifier) { } // Are they touching? + for (var i = 0, len = monster.length; i < len; i++) { if ( - hero.x <= (monster.x + 32) - && monster.x <= (hero.x + 32) - && hero.y <= (monster.y + 32) - && monster.y <= (hero.y + 32) + hero.x <= (monster[i][0] + 32) + && monster[i][0] <= (hero.x + 32) + && hero.y <= (monster[i][1] + 32) + && monster[i][1] <= (hero.y + 32) ) { ++monstersCaught; reset(); } + } }; - // The main game loop var main = function () { var now = Date.now(); From 430195f35c13ffb46ed87f4841f07c903408dea3 Mon Sep 17 00:00:00 2001 From: Melody Szabo Date: Sat, 28 Nov 2015 17:10:16 -0800 Subject: [PATCH 6/8] adding squirrel resource --- images/Squirrel.png | Bin 0 -> 19798 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/Squirrel.png diff --git a/images/Squirrel.png b/images/Squirrel.png new file mode 100644 index 0000000000000000000000000000000000000000..ee06cb8ec1643b0bebb09ec6bb2ed8abf356356c GIT binary patch literal 19798 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 BCL{m= literal 0 HcmV?d00001 From e6ba29c2bc02316917ef9a9f96295032a44ceab1 Mon Sep 17 00:00:00 2001 From: jenreiher Date: Sat, 28 Nov 2015 17:13:52 -0800 Subject: [PATCH 7/8] Update game.js --- js/game.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/js/game.js b/js/game.js index 8efbc6e..362e16c 100644 --- a/js/game.js +++ b/js/game.js @@ -68,23 +68,22 @@ var reset = function () { hero.x = canvas.width / 2; hero.y = canvas.height / 2; - // Throw the squirrel somewhere on the screen randomly - squirrel.x = 32 + (Math.random() * (canvas.width - 64)); - squirrel.y = 32 + (Math.random() * (canvas.height - 64)); - for (var i = 1; i <= monstersNum; i++) { console.log ("monster number = " + monstersNum) // Push monster x, y to array console.log ("i= " + i) - monster.push( - "monster" + i, -monster.x = 32 + (Math.random() * (canvas.width - 64)), - monster.y = 32 + (Math.random() * (canvas.height - 64))); + monster.push([ + monster.x = 32 + (Math.random() * (canvas.width - 64)), + monster.y = 32 + (Math.random() * (canvas.height - 64)) + ]); console.log("print array: " + monster) + console.log("print specific monster x coords:" + monster[i][1]) } monstersNum=monstersNum*2; + }; + // Draw everything var render = function () { if (bgReady) { @@ -93,15 +92,17 @@ var render = function () { if (heroReady) { ctx.drawImage(heroImage, hero.x, hero.y); } - for (var i = 0, len = monster.length; i < len; i++) { + for (var i = 0, len = monster.length; i < len; i++) { if (monsterReady) { ctx.drawImage(monsterImage, monster[i][0], monster[i][1]); } - + } + if (squirrelReady) { ctx.drawImage(squirrelImage, squirrel.x, squirrel.y); } - // Score + +// Score ctx.fillStyle = "rgb(250, 250, 250)"; ctx.font = "24px Helvetica"; ctx.textAlign = "left"; @@ -125,8 +126,8 @@ var update = function (modifier) { hero.x += hero.speed * modifier; } - // Are they touching? - for (var i = 0, len = monster.length; i < len; i++) { +// Are they touching? + for (var i = 0, len = monster.length; i < len; i++) { if ( hero.x <= (monster[i][0] + 32) && monster[i][0] <= (hero.x + 32) @@ -139,6 +140,7 @@ var update = function (modifier) { } }; + // The main game loop var main = function () { var now = Date.now(); From d4f4fa00cbffcff9f1c992ae02cbb96a46aef2ef Mon Sep 17 00:00:00 2001 From: jenreiher Date: Sat, 28 Nov 2015 18:22:34 -0800 Subject: [PATCH 8/8] Update game.js --- js/game.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/game.js b/js/game.js index 362e16c..7ef2936 100644 --- a/js/game.js +++ b/js/game.js @@ -79,7 +79,6 @@ var reset = function () { console.log("print array: " + monster) console.log("print specific monster x coords:" + monster[i][1]) } -monstersNum=monstersNum*2; }; @@ -135,6 +134,8 @@ var update = function (modifier) { && monster[i][1] <= (hero.y + 32) ) { ++monstersCaught; + ++monstersNum + monster = [50,50] reset(); } }