From 0fea76283eba029edd7b97690ea9cdcb8477ecb5 Mon Sep 17 00:00:00 2001 From: Justin Permann Date: Sat, 23 Mar 2013 22:41:50 -0600 Subject: [PATCH 1/2] added flea code --- client/flea.js | 56 +++++++++++++++++++++++++++++++++++++ client/graphics.js | 8 ++++++ client/states/game.js | 3 ++ public/img/spriteSheet.png | Bin 12575 -> 13086 bytes 4 files changed, 67 insertions(+) diff --git a/client/flea.js b/client/flea.js index e69de29..b53e9dc 100644 --- a/client/flea.js +++ b/client/flea.js @@ -0,0 +1,56 @@ +var flea; +function init(){ + flea = { + dir: "right", + visible: true, + deathTimer: 0, + time: 0, + x: Math.floor(Math.random() * 25) * 20, + y: 650, + dx: .2, + dy: .2 + }; +} +//to place a mushroom send in Math.floor x / 20 and y /20; + +function update(dTime){ + if(flea.x > 0 && flea.x < (500 - flea.width)) + flea.x += flea.dx * dTime; + else + { + flea.dx *= -1; + flea.x += flea.dx * dTime; + } + + if(flea.y + flea.height < 700 && flea.y > 449) + flea.y -= flea.dy * dTime; + else{ + flea.dy *= -1; + flea.y -= flea.dy * dTime; + } + + flea.time += dTime; + if(flea.time >= 2000){ + flea.time = 0; + flea.dx = (Math.random() * .4) -.2; + flea.dy = (Math.random() * .4) -.2; + } + + if(!flea.visible){ + flea.deathTimer += dTime; + if(flea.deathTimer >= 10000){ + flea.visible = true; + flea.deathTimer = 0; + flea.y = Math.floor(Math.random() * 50) + 500; + } + } +}; + +function render(ctx, g){ + g.drawFlea(ctx, flea.dir, flea.x, flea.y); +}; + + +exports.init = init; +exports.update = update; +exports.render = render; \ No newline at end of file diff --git a/client/graphics.js b/client/graphics.js index ee95396..fcd5334 100644 --- a/client/graphics.js +++ b/client/graphics.js @@ -41,6 +41,13 @@ function drawScorpion(LtoR, ctx, x, y){ ctx.drawImage(spriteSheet, 300, 0, 50, 50, x, y, 20, 20); } +function drawFlea(ctx, dir, x, y){ + if(dir == 'right') + ctx.drawImage(spriteSheet, 350, 150, 50, 50, x, y, 20, 20); + if(dir == 'left') + ctx.drawImage(spriteSheet, 400, 150, 50, 50, x, y, 20, 20); +}; + function drawPeed(ctx, isHead, RtoL, x, y) { if (RtoL) { if (isHead) @@ -64,4 +71,5 @@ exports.drawMushrooms = drawMushrooms; exports.drawSpider = drawSpider; exports.drawScorpion = drawScorpion; exports.drawPeed = drawPeed; +exports.drawFlea = drawFlea; exports.init = init; diff --git a/client/states/game.js b/client/states/game.js index b6c37e6..cd30b99 100644 --- a/client/states/game.js +++ b/client/states/game.js @@ -22,6 +22,7 @@ function start() { scorpion.init(); centipede.init(); shrooms.init(); + flea.init(); } function stop() { @@ -36,6 +37,7 @@ function update(dTime){ spider.update(dTime); scorpion.update(dTime); centipede.update(dTime); + flea.update(dTime); }; @@ -48,6 +50,7 @@ function render(ctx){ spider.render(ctx, g); scorpion.render(ctx, g); centipede.render(ctx, g); + flea.render(ctx, g); }; exports.start = start; diff --git a/public/img/spriteSheet.png b/public/img/spriteSheet.png index 7439807d2d63e9e9dabc41544fe3ec892692b8c0..40ee99e751d8d85fed3d5d9d96b056e9a9b89af8 100644 GIT binary patch literal 13086 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 literal 12575 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 NYdm>asP;VQe*sQ;wBY~% From eaaaaa46d1b13ac52cf3451300fb681f2194a944 Mon Sep 17 00:00:00 2001 From: Justin Permann Date: Sat, 23 Mar 2013 23:05:49 -0600 Subject: [PATCH 2/2] flea and spider can kill you, bullets kill flea --- client/bullets.js | 10 ++++- client/collision.js | 6 ++- client/flea.js | 100 ++++++++++++++++++++++++++++++-------------- client/playa.js | 10 ++--- 4 files changed, 85 insertions(+), 41 deletions(-) diff --git a/client/bullets.js b/client/bullets.js index eb4c65f..61e6611 100644 --- a/client/bullets.js +++ b/client/bullets.js @@ -3,7 +3,8 @@ var spider = require('./spider') , scorpion = require('./scorpion') , peed = require('./centipede') , collision = require('./collision') - , shrooms = require('./shrooms') +, shrooms = require('./shrooms') +, flea = require('./flea') ; function add(x, y){ @@ -30,10 +31,15 @@ function update(dTime){ if(collision.Scorpion(scorpion.pos(), bullets[n]) && scorpion.visible()) { bullets.splice(n--, 1); - --n; scorpion.hide(); continue; } + if(collision.Flea(flea.pos(), bullets[n]) && flea.visible()){ + console.log("flea collision"); + bullets.splice(n--, 1); + flea.hide(); + continue; + } var centipeed = peed.getPeed(); var ind = collision.Peed(bullets[n], centipeed); diff --git a/client/collision.js b/client/collision.js index 30be7da..6ae33d8 100644 --- a/client/collision.js +++ b/client/collision.js @@ -1,3 +1,4 @@ +var spider = require('./spider'), flea = require('./flea'); function collides(obj1, obj2){ if(obj2.x + obj2.width > obj1.x && obj2.x < obj1.x + obj1.width) if(obj2.y + obj2.height > obj1.y && obj2.y < obj1.y + obj1.height) @@ -65,8 +66,8 @@ function checkPoison(mushrooms, poison, scorpion){ } }; -function isDead(spider, thisChar){ - return (collides(spider, thisChar) && spider.visible); +function isDead(thisChar){ + return (collides(spider.pos(), thisChar) && spider.visible || collides(flea.pos(), thisChar) && flea.visible); }; function cantMove(mushrooms, thisChar){ @@ -81,6 +82,7 @@ exports.Mush = Mush; exports.Poison = Poison; exports.Spider = collides; exports.Scorpion = collides; +exports.Flea = collides; exports.Peed = Peed exports.checkPoison = checkPoison; exports.isDead = isDead; diff --git a/client/flea.js b/client/flea.js index b53e9dc..eb44b08 100644 --- a/client/flea.js +++ b/client/flea.js @@ -5,52 +5,88 @@ function init(){ visible: true, deathTimer: 0, time: 0, + width: 20, + height: 20, x: Math.floor(Math.random() * 25) * 20, - y: 650, - dx: .2, - dy: .2 + y: 550, + dx: .1, + dy: .1 }; } //to place a mushroom send in Math.floor x / 20 and y /20; function update(dTime){ - if(flea.x > 0 && flea.x < (500 - flea.width)) - flea.x += flea.dx * dTime; - else - { - flea.dx *= -1; - flea.x += flea.dx * dTime; - } - - if(flea.y + flea.height < 700 && flea.y > 449) - flea.y -= flea.dy * dTime; - else{ - flea.dy *= -1; - flea.y -= flea.dy * dTime; - } + flea.x += flea.dx * dTime; + flea.y += flea.dy * dTime; + flea.time += dTime; - flea.time += dTime; - if(flea.time >= 2000){ - flea.time = 0; - flea.dx = (Math.random() * .4) -.2; - flea.dy = (Math.random() * .4) -.2; - } + if (flea.x < 0) { + flea.x = 0; + flea.dx *= -1; + } + + if (flea.x > 500 - flea.width) { + flea.x = 500 - flea.width; + flea.dx *= -1; + } + + if (flea.y > 700 - flea.height) { + flea.y = 700 - flea.height; + flea.dy *= -1; + } - if(!flea.visible){ - flea.deathTimer += dTime; - if(flea.deathTimer >= 10000){ - flea.visible = true; - flea.deathTimer = 0; - flea.y = Math.floor(Math.random() * 50) + 500; - } + if (flea.y < 550) { + flea.y = 550; + flea.dy *= -1; + } + + if (flea.time >= 2000) { + flea.time = 0; + flea.dx = (Math.random() * .2) - .1; + flea.dy = (Math.random() * .2) - .1; + } + + if (!flea.visible) { + flea.deathTimer += dTime; + if (flea.deathTimer >= 10000) { + flea.visible = true; + flea.deathTimer = 0; + flea.y = 350; + flea.x = Math.floor(Math.random() * (500 - flea.width)); } + } + + // if (flea.visible && flea.hungry >= 5000) { + // var tileX = Math.floor(flea.x / 20) + 1; + // var tileY = Math.floor(flea.y / 20) + 1; + // if (shrooms.existsAt(tileX, tileY)) { + // shrooms.eatAt(tileX, tileY); + // flea.hungry = 0; + // } + //} }; function render(ctx, g){ - g.drawFlea(ctx, flea.dir, flea.x, flea.y); + if(flea.visible) + g.drawFlea(ctx, flea.dir, flea.x, flea.y); }; +function pos(){ + return{x: flea.x, y: flea.y, width: flea.width, height: flea.height}; +} + +function hide(){ + flea.visible = false; +} + +function visible(){ + return flea.visible; +} + exports.init = init; exports.update = update; -exports.render = render; \ No newline at end of file +exports.render = render; +exports.pos = pos; +exports.hide = hide; +exports.visible = visible; \ No newline at end of file diff --git a/client/playa.js b/client/playa.js index ee7b448..14e6a59 100644 --- a/client/playa.js +++ b/client/playa.js @@ -46,11 +46,11 @@ function update(dTime){ snd.playEffect('shoot'); bullets.add(players[n].x, players[n].y); } - // if(collision.isDead(spider, players[n])) - // { - // players[n].x = 0; - // players[n].y = 650; - // } + if(collision.isDead(players[n])) + { + players[n].x = 0; + players[n].y = 650; + } } };