minimal-web-templates – Diff between revs 1 and 2

Subversion Repositories:

?pathlinks?

Rev 1 – Details – Blame – Last modification – View Log

Only display areas with differences – Ignore whitespace

-/*jslint browser: true, undef: true, eqeqeq: true, nomen: true, white: true */
+/*************************************************************************/
-/*global window: false, document: false */
+/*    Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3    */
-/*
- * fix looped audio
- * add fruits + levels
+/*************************************************************************/
- * fix what happens when a ghost is eaten (should go back to base)
+/*     Original by: Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>     */
- * do proper ghost mechanics (blinky/wimpy etc)
+/*************************************************************************/
- */
 var NONE        = 4,
     UP          = 3,
     LEFT        = 2,
     DOWN        = 1,
     RIGHT       = 11,
     WAITING     = 5,
     PAUSE       = 6,
     PLAYING     = 7,
     COUNTDOWN   = 8,
     EATEN_PAUSE = 9,
     DYING       = 10,
     Pacman      = {};
 Pacman.FPS = 30;
 Pacman.Ghost = function (game, map, colour) {
     var position  = null,
         direction = null,
         eatable   = null,
         eaten     = null,
         due       = null;
     function getNewCoord(dir, current) {
         var speed  = isVunerable() ? 1 : isHidden() ? 4 : 2,
             xSpeed = (dir === LEFT && -speed || dir === RIGHT && speed || 0),
             ySpeed = (dir === DOWN && speed || dir === UP && -speed || 0);
         return {
             "x": addBounded(current.x, xSpeed),
             "y": addBounded(current.y, ySpeed)
         };
     };
     /* Collision detection(walls) is done when a ghost lands on an
      * exact block, make sure they dont skip over it
      */
     function addBounded(x1, x2) {
         var rem    = x1 % 10,
             result = rem + x2;
         if (rem !== 0 && result > 10) {
             return x1 + (10 - rem);
         } else if(rem > 0 && result < 0) {
             return x1 - rem;
+        }
         return x1 + x2;
     };
     function isVunerable() {
         return eatable !== null;
     };
     function isDangerous() {
         return eaten === null;
     };
     function isHidden() {
         return eatable === null && eaten !== null;
     };
     function getRandomDirection() {
         var moves = (direction === LEFT || direction === RIGHT)
             ? [UP, DOWN] : [LEFT, RIGHT];
         return moves[Math.floor(Math.random() * 2)];
     };
     function reset() {
         eaten = null;
         eatable = null;
         position = {"x": 90, "y": 80};
         direction = getRandomDirection();
         due = getRandomDirection();
     };
     function onWholeSquare(x) {
         return x % 10 === 0;
     };
     function oppositeDirection(dir) {
         return dir === LEFT && RIGHT ||
             dir === RIGHT && LEFT ||
             dir === UP && DOWN || UP;
     };
     function makeEatable() {
         direction = oppositeDirection(direction);
         eatable = game.getTick();
     };
     function eat() {
         eatable = null;
         eaten = game.getTick();
     };
     function pointToCoord(x) {
         return Math.round(x / 10);
     };
     function nextSquare(x, dir) {
         var rem = x % 10;
         if (rem === 0) {
             return x;
         } else if (dir === RIGHT || dir === DOWN) {
             return x + (10 - rem);
         } else {
             return x - rem;
+        }
     };
     function onGridSquare(pos) {
         return onWholeSquare(pos.y) && onWholeSquare(pos.x);
     };
     function secondsAgo(tick) {
         return (game.getTick() - tick) / Pacman.FPS;
     };
     function getColour() {
         if (eatable) {
             if (secondsAgo(eatable) > 5) {
                 return game.getTick() % 20 > 10 ? "#FFFFFF" : "#0000BB";
             } else {
                 return "#0000BB";
+            }
         } else if(eaten) {
             return "#222";
+        }
         return colour;
     };
     function draw(ctx) {
         var s    = map.blockSize,
             top  = (position.y/10) * s,
             left = (position.x/10) * s;
         if (eatable && secondsAgo(eatable) > 8) {
             eatable = null;
+        }
         if (eaten && secondsAgo(eaten) > 3) {
             eaten = null;
+        }
         var tl = left + s;
         var base = top + s - 3;
         var inc = s / 10;
         var high = game.getTick() % 10 > 5 ? 3  : -3;
         var low  = game.getTick() % 10 > 5 ? -3 : 3;
         ctx.fillStyle = getColour();
         ctx.beginPath();
         ctx.moveTo(left, base);
         ctx.quadraticCurveTo(left, top, left + (s/2),  top);
         ctx.quadraticCurveTo(left + s, top, left+s,  base);
         // Wavy things at the bottom
         ctx.quadraticCurveTo(tl-(inc*1), base+high, tl - (inc * 2),  base);
         ctx.quadraticCurveTo(tl-(inc*3), base+low, tl - (inc * 4),  base);
         ctx.quadraticCurveTo(tl-(inc*5), base+high, tl - (inc * 6),  base);
         ctx.quadraticCurveTo(tl-(inc*7), base+low, tl - (inc * 8),  base);
         ctx.quadraticCurveTo(tl-(inc*9), base+high, tl - (inc * 10), base);
         ctx.closePath();
         ctx.fill();
         ctx.beginPath();
         ctx.fillStyle = "#FFF";
         ctx.arc(left + 6,top + 6, s / 6, 0, 300, false);
         ctx.arc((left + s) - 6,top + 6, s / 6, 0, 300, false);
         ctx.closePath();
         ctx.fill();
         var f = s / 12;
         var off = {};
         off[RIGHT] = [f, 0];
         off[LEFT]  = [-f, 0];
         off[UP]    = [0, -f];
         off[DOWN]  = [0, f];
         ctx.beginPath();
         ctx.fillStyle = "#000";
         ctx.arc(left+6+off[direction][0], top+6+off[direction][1],
                 s / 15, 0, 300, false);
         ctx.arc((left+s)-6+off[direction][0], top+6+off[direction][1],
                 s / 15, 0, 300, false);
         ctx.closePath();
         ctx.fill();
     };
     function pane(pos) {
         if (pos.y === 100 && pos.x >= 190 && direction === RIGHT) {
             return {"y": 100, "x": -10};
+        }
         if (pos.y === 100 && pos.x <= -10 && direction === LEFT) {
 <= -10 && direction === LEFT) {        if (score >= 10000 && score - nScore < 10000) {
 <= -10 && direction === LEFT) {< 10000) {         if (amount >= 1) {
-<= -10 && direction === LEFT) {< 10000) { < height; i += 1) {< width; j += 1) {< playing.length; i++) {< playing.length; i++) {< playing.length; i++) {< playing.length; i++) {< len; i += 1) {< len; i += 1) {< len; i += 1) {< len; i += 1) {                   (tick - timerStart) > (Pacman.FPS / 3)) {
+<= -10 && direction === LEFT) {< 10000) { < height; i += 1) {< width; j += 1) {< len; i += 1) {< len; i += 1) {< len; i += 1) {< len; i += 1) {                   (tick - timerStart) > (Pacman.FPS / 3)) {