From 20a9685d642057add6df3cb295ea3eac282e3ce3 Mon Sep 17 00:00:00 2001
From: Jacklyne Bouier <jacklynebouier@Jacklynes-Mac-mini.local>
Date: Thu, 11 May 2017 11:00:13 -0700
Subject: [PATCH 1/3] platform game moved to forked repo and working

---
 public/css/platform.css |  41 ++++
 public/index.html       |   2 +-
 public/js/platform.js   | 491 ++++++++++++++++++++++++++++++++++++++++
 public/platform.html    |  20 ++
 4 files changed, 553 insertions(+), 1 deletion(-)
 create mode 100644 public/css/platform.css
 create mode 100644 public/js/platform.js
 create mode 100644 public/platform.html

diff --git a/public/css/platform.css b/public/css/platform.css
new file mode 100644
index 0000000..d0ab0f3
--- /dev/null
+++ b/public/css/platform.css
@@ -0,0 +1,41 @@
+/*Each row of the grid is turned into a table row (<tr> element). The strings in
+the grid are used as class names for the table cell (<td>) elements.*/
+
+.background {
+  background: rgb(52, 166, 251);
+  table-layout: fixed;
+  border-spacing: 0;
+}
+
+.background td {
+  padding: 0;
+}
+
+.lava {
+  background: rgb(255, 100, 100);
+}
+
+.wall {
+  background: white;
+}
+
+.actor {position: absolute;}
+
+.coin {background: rgb(241, 229, 89);}
+
+.player {background: rgb(64,64,64); }
+
+.lost .player {
+  background: rgb(160, 64, 64);
+}
+
+.won .player {
+  box-shadow: -4px -7px 8px white, 4px -7px 8px white;
+}
+
+.game {
+  overflow: hidden;
+  max-width: 600px;
+  max-height: 450px;
+  position: relative;
+}
diff --git a/public/index.html b/public/index.html
index 278d291..29eadf0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -13,7 +13,7 @@ <h1>Browser Games</h1>
 
     <nav>
       <ul>
-        <li><a>LINK TO FIRST GAME</a></li>
+        <li><a href="platform.html"> Platform Game</a></li>
         <li><a>LINK TO SECOND GAME</a></li>
         <li>...</li>
       </ul>
diff --git a/public/js/platform.js b/public/js/platform.js
new file mode 100644
index 0000000..e6ed888
--- /dev/null
+++ b/public/js/platform.js
@@ -0,0 +1,491 @@
+var GAME_LEVELS = [
+  ["                                                                                ",
+   "                                                                                ",
+   "                                                                                ",
+   "                                                                                ",
+   "                                                                                ",
+   "                                                                                ",
+   "                                                                  xxx           ",
+   "                                                   xx      xx    xx!xx          ",
+   "                                    o o      xx                  x!!!x          ",
+   "                                                                 xx!xx          ",
+   "                                   xxxxx                          xvx           ",
+   "                                                                            xx  ",
+   "  xx                                      o o                                x  ",
+   "  x                     o                                                    x  ",
+   "  x                                      xxxxx                             o x  ",
+   "  x          xxxx       o                                                    x  ",
+   "  x  @       x  x                                                xxxxx       x  ",
+   "  xxxxxxxxxxxx  xxxxxxxxxxxxxxx   xxxxxxxxxxxxxxxxxxxx     xxxxxxx   xxxxxxxxx  ",
+   "                              x   x                  x     x                    ",
+   "                              x!!!x                  x!!!!!x                    ",
+   "                              x!!!x                  x!!!!!x                    ",
+   "                              xxxxx                  xxxxxxx                    ",
+   "                                                                                ",
+   "                                                                                "],
+  ["                                      x!!x                        xxxxxxx                                    x!x  ",
+   "                                      x!!x                     xxxx     xxxx                                 x!x  ",
+   "                                      x!!xxxxxxxxxx           xx           xx                                x!x  ",
+   "                                      xx!!!!!!!!!!xx         xx             xx                               x!x  ",
+   "                                       xxxxxxxxxx!!x         x                                    o   o   o  x!x  ",
+   "                                                xx!x         x     o   o                                    xx!x  ",
+   "                                                 x!x         x                                xxxxxxxxxxxxxxx!!x  ",
+   "                                                 xvx         x     x   x                        !!!!!!!!!!!!!!xx  ",
+   "                                                             xx  |   |   |  xx            xxxxxxxxxxxxxxxxxxxxx   ",
+   "                                                              xx!!!!!!!!!!!xx            v                        ",
+   "                                                               xxxx!!!!!xxxx                                      ",
+   "                                               x     x            xxxxxxx        xxx         xxx                  ",
+   "                                               x     x                           x x         x x                  ",
+   "                                               x     x                             x         x                    ",
+   "                                               x     x                             xx        x                    ",
+   "                                               xx    x                             x         x                    ",
+   "                                               x     x      o  o     x   x         x         x                    ",
+   "               xxxxxxx        xxx   xxx        x     x               x   x         x         x                    ",
+   "              xx     xx         x   x          x     x     xxxxxx    x   x   xxxxxxxxx       x                    ",
+   "             xx       xx        x o x          x    xx               x   x   x               x                    ",
+   "     @       x         x        x   x          x     x               x   x   x               x                    ",
+   "    xxx      x         x        x   x          x     x               x   xxxxx   xxxxxx      x                    ",
+   "    x x      x         x       xx o xx         x     x               x     o     x x         x                    ",
+   "!!!!x x!!!!!!x         x!!!!!!xx     xx!!!!!!!!xx    x!!!!!!!!!!     x     =     x x         x                    ",
+   "!!!!x x!!!!!!x         x!!!!!xx       xxxxxxxxxx     x!!!!!!!xx!     xxxxxxxxxxxxx xx  o o  xx                    ",
+   "!!!!x x!!!!!!x         x!!!!!x    o                 xx!!!!!!xx !                    xx     xx                     ",
+   "!!!!x x!!!!!!x         x!!!!!x                     xx!!!!!!xx  !                     xxxxxxx                      ",
+   "!!!!x x!!!!!!x         x!!!!!xx       xxxxxxxxxxxxxx!!!!!!xx   !                                                  ",
+   "!!!!x x!!!!!!x         x!!!!!!xxxxxxxxx!!!!!!!!!!!!!!!!!!xx    !                                                  ",
+   "!!!!x x!!!!!!x         x!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!xx     !                                                  "],
+  ["                                                                                                              ",
+   "                                                                                                              ",
+   "                                                                                                              ",
+   "                                                                                                              ",
+   "                                                                                                              ",
+   "                                        o                                                                     ",
+   "                                                                                                              ",
+   "                                        x                                                                     ",
+   "                                        x                                                                     ",
+   "                                        x                                                                     ",
+   "                                        x                                                                     ",
+   "                                       xxx                                                                    ",
+   "                                       x x                 !!!        !!!  xxx                                ",
+   "                                       x x                 !x!        !x!                                     ",
+   "                                     xxx xxx                x          x                                      ",
+   "                                      x   x                 x   oooo   x       xxx                            ",
+   "                                      x   x                 x          x      x!!!x                           ",
+   "                                      x   x                 xxxxxxxxxxxx       xxx                            ",
+   "                                     xx   xx      x   x      x                                                ",
+   "                                      x   xxxxxxxxx   xxxxxxxx              x x                               ",
+   "                                      x   x           x                    x!!!x                              ",
+   "                                      x   x           x                     xxx                               ",
+   "                                     xx   xx          x                                                       ",
+   "                                      x   x= = = =    x            xxx                                        ",
+   "                                      x   x           x           x!!!x                                       ",
+   "                                      x   x    = = = =x     o      xxx       xxx                              ",
+   "                                     xx   xx          x                     x!!!x                             ",
+   "                              o   o   x   x           x     x                xxv        xxx                   ",
+   "                                      x   x           x              x                 x!!!x                  ",
+   "                             xxx xxx xxx xxx     o o  x!!!!!!!!!!!!!!x                   vx                   ",
+   "                             x xxx x x xxx x          x!!!!!!!!!!!!!!x                                        ",
+   "                             x             x   xxxxxxxxxxxxxxxxxxxxxxx                                        ",
+   "                             xx           xx                                         xxx                      ",
+   "  xxx                         x     x     x                                         x!!!x                xxx  ",
+   "  x x                         x    xxx    x                                          xxx                 x x  ",
+   "  x                           x    xxx    xxxxxxx                        xxxxx                             x  ",
+   "  x                           x           x                              x   x                             x  ",
+   "  x                           xx          x                              x x x                             x  ",
+   "  x                                       x       |xxxx|    |xxxx|     xxx xxx                             x  ",
+   "  x                xxx             o o    x                              x         xxx                     x  ",
+   "  x               xxxxx       xx          x                             xxx       x!!!x          x         x  ",
+   "  x               oxxxo       x    xxx    x                             x x        xxx          xxx        x  ",
+   "  x                xxx        xxxxxxxxxxxxx  x oo x    x oo x    x oo  xx xx                    xxx        x  ",
+   "  x      @          x         x           x!!x    x!!!!x    x!!!!x    xx   xx                    x         x  ",
+   "  xxxxxxxxxxxxxxxxxxxxxxxxxxxxx           xxxxxxxxxxxxxxxxxxxxxxxxxxxxx     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx  ",
+   "                                                                                                              ",
+   "                                                                                                              "],
+  ["                                                                                                  xxx x       ",
+   "                                                                                                      x       ",
+   "                                                                                                  xxxxx       ",
+   "                                                                                                  x           ",
+   "                                                                                                  x xxx       ",
+   "                          o                                                                       x x x       ",
+   "                                                                                             o o oxxx x       ",
+   "                   xxx                                                                                x       ",
+   "       !  o  !                                                xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx       ",
+   "       x     x                                                x   x x   x x   x x   x x   x x   x x           ",
+   "       x= o  x            x                                   xxx x xxx x xxx x xxx x xxx x xxx x xxxxx       ",
+   "       x     x                                                  x x   x x   x x   x x   x x   x x     x       ",
+   "       !  o  !            o                                  xxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxxxx       ",
+   "                                                                                                              ",
+   "          o              xxx                              xx                                                  ",
+   "                                                                                                              ",
+   "                                                                                                              ",
+   "                                                      xx                                                      ",
+   "                   xxx         xxx                                                                            ",
+   "                                                                                                              ",
+   "                          o                                                     x      x                      ",
+   "                                                          xx     xx                                           ",
+   "             xxx         xxx         xxx                                 x                  x                 ",
+   "                                                                                                              ",
+   "                                                                 ||                                           ",
+   "  xxxxxxxxxxx                                                                                                 ",
+   "  x         x o xxxxxxxxx o xxxxxxxxx o xx                                                x                   ",
+   "  x         x   x       x   x       x   x                 ||                  x     x                         ",
+   "  x  @      xxxxx   o   xxxxx   o   xxxxx                                                                     ",
+   "  xxxxxxx                                     xxxxx       xx     xx     xxx                                   ",
+   "        x=                  =                =x   x                     xxx                                   ",
+   "        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx   x!!!!!!!!!!!!!!!!!!!!!xxx!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
+   "                                                  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+   "                                                                                                              "]
+];
+
+
+function Level(plan) {
+  this.width = plan[0].length;
+  this.height = plan.length;
+  this.grid = [];
+  this.actors = [];
+
+  for (var y = 0; y < this.height; y++) {
+    var line = plan[y], gridLine = [];
+    for (var x = 0; x < this.width; x++) {
+      var ch = line[x], fieldType = null;
+      var Actor = actorChars[ch];
+      if (Actor)
+        this.actors.push(new Actor(new Vector(x, y), ch));
+      else if (ch == "x")
+        fieldType = "wall";
+      else if (ch == "!")
+        fieldType = "lava";
+      gridLine.push(fieldType);
+    }
+    this.grid.push(gridLine);
+  }
+
+  this.player = this.actors.filter(function(actor) {
+    return actor.type == "player";
+  })[0];
+  this.status = this.finishDelay = null;
+}
+
+Level.prototype.isFinished = function() {
+  return this.status != null && this.finishDelay < 0;
+};
+
+function Vector(x, y) {
+  this.x = x; this.y = y;
+}
+Vector.prototype.plus = function(other) {
+  return new Vector(this.x + other.x, this.y + other.y);
+};
+Vector.prototype.times = function(factor) {
+  return new Vector(this.x * factor, this.y * factor);
+};
+
+var actorChars = {
+  "@": Player,
+  "o": Coin,
+  "=": Lava, "|": Lava, "v": Lava
+};
+
+function Player(pos) {
+  this.pos = pos.plus(new Vector(0, -0.5));
+  this.size = new Vector(0.8, 1.5);
+  this.speed = new Vector(0, 0);
+}
+Player.prototype.type = "player";
+
+function Lava(pos, ch) {
+  this.pos = pos;
+  this.size = new Vector(1, 1);
+  if (ch == "=") {
+    this.speed = new Vector(2, 0);
+  } else if (ch == "|") {
+    this.speed = new Vector(0, 2);
+  } else if (ch == "v") {
+    this.speed = new Vector(0, 3);
+    this.repeatPos = pos;
+  }
+}
+Lava.prototype.type = "lava";
+
+function Coin(pos) {
+  this.basePos = this.pos = pos.plus(new Vector(0.2, 0.1));
+  this.size = new Vector(0.6, 0.6);
+  this.wobble = Math.random() * Math.PI * 2;
+}
+Coin.prototype.type = "coin";
+
+var simpleLevel = new Level(GAME_LEVELS);
+
+function elt(name, className) {
+  var elt = document.createElement(name);
+  if (className) elt.className = className;
+  return elt;
+}
+
+function DOMDisplay(parent, level) {
+  this.wrap = parent.appendChild(elt("div", "game"));
+  this.level = level;
+
+  this.wrap.appendChild(this.drawBackground());
+  this.actorLayer = null;
+  this.drawFrame();
+}
+
+var scale = 20;
+
+DOMDisplay.prototype.drawBackground = function() {
+  var table = elt("table", "background");
+  table.style.width = this.level.width * scale + "px";
+  this.level.grid.forEach(function(row) {
+    var rowElt = table.appendChild(elt("tr"));
+    rowElt.style.height = scale + "px";
+    row.forEach(function(type) {
+      rowElt.appendChild(elt("td", type));
+    });
+  });
+  return table;
+};
+
+DOMDisplay.prototype.drawActors = function() {
+  var wrap = elt("div");
+  this.level.actors.forEach(function(actor) {
+    var rect = wrap.appendChild(elt("div",
+                                    "actor " + actor.type));
+    rect.style.width = actor.size.x * scale + "px";
+    rect.style.height = actor.size.y * scale + "px";
+    rect.style.left = actor.pos.x * scale + "px";
+    rect.style.top = actor.pos.y * scale + "px";
+  });
+  return wrap;
+};
+
+DOMDisplay.prototype.drawFrame = function() {
+  if (this.actorLayer)
+    this.wrap.removeChild(this.actorLayer);
+  this.actorLayer = this.wrap.appendChild(this.drawActors());
+  this.wrap.className = "game " + (this.level.status || "");
+  this.scrollPlayerIntoView();
+};
+
+DOMDisplay.prototype.scrollPlayerIntoView = function() {
+  var width = this.wrap.clientWidth;
+  var height = this.wrap.clientHeight;
+  var margin = width / 3;
+
+  // The viewport
+  var left = this.wrap.scrollLeft, right = left + width;
+  var top = this.wrap.scrollTop, bottom = top + height;
+
+  var player = this.level.player;
+  var center = player.pos.plus(player.size.times(0.5))
+                 .times(scale);
+
+  if (center.x < left + margin)
+    this.wrap.scrollLeft = center.x - margin;
+  else if (center.x > right - margin)
+    this.wrap.scrollLeft = center.x + margin - width;
+  if (center.y < top + margin)
+    this.wrap.scrollTop = center.y - margin;
+  else if (center.y > bottom - margin)
+    this.wrap.scrollTop = center.y + margin - height;
+};
+
+DOMDisplay.prototype.clear = function() {
+  this.wrap.parentNode.removeChild(this.wrap);
+};
+
+Level.prototype.obstacleAt = function(pos, size) {
+  var xStart = Math.floor(pos.x);
+  var xEnd = Math.ceil(pos.x + size.x);
+  var yStart = Math.floor(pos.y);
+  var yEnd = Math.ceil(pos.y + size.y);
+
+  if (xStart < 0 || xEnd > this.width || yStart < 0)
+    return "wall";
+  if (yEnd > this.height)
+    return "lava";
+  for (var y = yStart; y < yEnd; y++) {
+    for (var x = xStart; x < xEnd; x++) {
+      var fieldType = this.grid[y][x];
+      if (fieldType) return fieldType;
+    }
+  }
+};
+
+Level.prototype.actorAt = function(actor) {
+  for (var i = 0; i < this.actors.length; i++) {
+    var other = this.actors[i];
+    if (other != actor &&
+        actor.pos.x + actor.size.x > other.pos.x &&
+        actor.pos.x < other.pos.x + other.size.x &&
+        actor.pos.y + actor.size.y > other.pos.y &&
+        actor.pos.y < other.pos.y + other.size.y)
+      return other;
+  }
+};
+
+var maxStep = 0.05;
+
+Level.prototype.animate = function(step, keys) {
+  if (this.status != null)
+    this.finishDelay -= step;
+
+  while (step > 0) {
+    var thisStep = Math.min(step, maxStep);
+    this.actors.forEach(function(actor) {
+      actor.act(thisStep, this, keys);
+    }, this);
+    step -= thisStep;
+  }
+};
+
+Lava.prototype.act = function(step, level) {
+  var newPos = this.pos.plus(this.speed.times(step));
+  if (!level.obstacleAt(newPos, this.size))
+    this.pos = newPos;
+  else if (this.repeatPos)
+    this.pos = this.repeatPos;
+  else
+    this.speed = this.speed.times(-1);
+};
+
+var wobbleSpeed = 8, wobbleDist = 0.07;
+
+Coin.prototype.act = function(step) {
+  this.wobble += step * wobbleSpeed;
+  var wobblePos = Math.sin(this.wobble) * wobbleDist;
+  this.pos = this.basePos.plus(new Vector(0, wobblePos));
+};
+
+var playerXSpeed = 7;
+
+Player.prototype.moveX = function(step, level, keys) {
+  this.speed.x = 0;
+  if (keys.left) this.speed.x -= playerXSpeed;
+  if (keys.right) this.speed.x += playerXSpeed;
+
+  var motion = new Vector(this.speed.x * step, 0);
+  var newPos = this.pos.plus(motion);
+  var obstacle = level.obstacleAt(newPos, this.size);
+  if (obstacle)
+    level.playerTouched(obstacle);
+  else
+    this.pos = newPos;
+};
+
+var gravity = 30;
+var jumpSpeed = 17;
+
+Player.prototype.moveY = function(step, level, keys) {
+  this.speed.y += step * gravity;
+  var motion = new Vector(0, this.speed.y * step);
+  var newPos = this.pos.plus(motion);
+  var obstacle = level.obstacleAt(newPos, this.size);
+  if (obstacle) {
+    level.playerTouched(obstacle);
+    if (keys.up && this.speed.y > 0)
+      this.speed.y = -jumpSpeed;
+    else
+      this.speed.y = 0;
+  } else {
+    this.pos = newPos;
+  }
+};
+
+Player.prototype.act = function(step, level, keys) {
+  this.moveX(step, level, keys);
+  this.moveY(step, level, keys);
+
+  var otherActor = level.actorAt(this);
+  if (otherActor)
+    level.playerTouched(otherActor.type, otherActor);
+
+  // Losing animation
+  if (level.status == "lost") {
+    this.pos.y += step;
+    this.size.y -= step;
+  }
+};
+
+Level.prototype.playerTouched = function(type, actor) {
+  if (type == "lava" && this.status == null) {
+    this.status = "lost";
+    this.finishDelay = 1;
+  } else if (type == "coin") {
+    this.actors = this.actors.filter(function(other) {
+      return other != actor;
+    });
+    if (!this.actors.some(function(actor) {
+      return actor.type == "coin";
+    })) {
+      this.status = "won";
+      this.finishDelay = 1;
+    }
+  }
+};
+
+var arrowCodes = {37: "left", 38: "up", 39: "right"};
+
+function trackKeys(codes) {
+  var pressed = Object.create(null);
+  function handler(event) {
+    if (codes.hasOwnProperty(event.keyCode)) {
+      var down = event.type == "keydown";
+      pressed[codes[event.keyCode]] = down;
+      event.preventDefault();
+    }
+  }
+  addEventListener("keydown", handler);
+  addEventListener("keyup", handler);
+  return pressed;
+}
+
+function runAnimation(frameFunc) {
+  var lastTime = null;
+  function frame(time) {
+    var stop = false;
+    if (lastTime != null) {
+      var timeStep = Math.min(time - lastTime, 100) / 1000;
+      stop = frameFunc(timeStep) === false;
+    }
+    lastTime = time;
+    if (!stop)
+      requestAnimationFrame(frame);
+  }
+  requestAnimationFrame(frame);
+}
+
+var arrows = trackKeys(arrowCodes);
+
+function runLevel(level, Display, andThen) {
+  var display = new Display(document.body, level);
+  runAnimation(function(step) {
+    level.animate(step, arrows);
+    display.drawFrame(step);
+    if (level.isFinished()) {
+      display.clear();
+      if (andThen)
+        andThen(level.status);
+      return false;
+    }
+  });
+}
+
+function runGame(plans, Display) {
+  function startLevel(n, lives) {
+    runLevel(new Level(plans[n]), Display, function(status) {
+      if (status == "lost") {
+        if (lives > 0) {
+          startLevel(n, lives - 1);
+        } else {
+          console.log("Game over");
+          startLevel(0, 3);
+        }
+      } else if (n < plans.length - 1) {
+        startLevel(n + 1, lives);
+      } else {
+        console.log("You win!");
+      }
+    });
+  }
+  startLevel(0, 3);
+}
diff --git a/public/platform.html b/public/platform.html
new file mode 100644
index 0000000..e40b6e0
--- /dev/null
+++ b/public/platform.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="css/platform.css">
+  <script type="text/javascript" src="js/platform.js">
+  </script>
+  <title>PlatForm Game</title>
+</head>
+
+<body>
+
+  <script>
+  runGame(GAME_LEVELS, DOMDisplay);
+  </script>
+
+</body>
+
+</html>

From 819b3a540707488b1d26534a605723a02157a2bf Mon Sep 17 00:00:00 2001
From: Jacklyne Bouier <jacklynebouier@Jacklynes-Mac-mini.local>
Date: Thu, 11 May 2017 11:27:24 -0700
Subject: [PATCH 2/3] For review

---
 README.md               |  55 +++++++
 public/css/platform.css |  14 +-
 public/index.html       |  37 ++---
 public/js/platform.js   | 314 +++++++++++++++++++++-------------------
 public/platform.html    |   4 +-
 5 files changed, 253 insertions(+), 171 deletions(-)

diff --git a/README.md b/README.md
index 09a972f..e90b17b 100644
--- a/README.md
+++ b/README.md
@@ -22,3 +22,58 @@ Available on:
 ```
 
 Then open `http://localhost:4321/` in your browser of choice and play away!
+
+## Description
+
+Implement a simple [platform](https://en.wikipedia.org/wiki/Platform_game) ("run and jump") game with HTML, CSS, and JavaScript.
+
+Follow [this tutorial](http://eloquentjavascript.net/15_game.html) from [Eloquent JavaScript](http://eloquentjavascript.net/).
+
+Fork the the [browser-games repository][browser-games] and use the fork as your project artifact.
+
+Implement the **Platform** game from the list in the [games.md][games-list] file.
+
+![platform-game](http://eloquentjavascript.net/img/darkblue.png)
+
+## Context
+
+This goal will challenge your ability to take a _formal, defined system_ from the real world and replicate it in code. You will start with all of the logic of the system (the rules of the game) and most of the UI already designed.
+
+Your work will be mainly in deciding how to replicate that formal logic and user interface using only JavaScript, HTML, and CSS.
+
+## Specifications
+
+#### General
+
+- [X] Artifact produced is a fork of the [browser-games][browser-games] repo.
+- [X] Variables, functions, files, etc. have appropriate and meaningful names.
+- [X] HTML, CSS, and JS files are well formatted with proper spacing and indentation.
+- [X] There is a clear separation of game logic code from view/rendering code.
+- [X] All major features are added via pull requests with a clear description and concise commit messages.
+- [X] The artifact produced is properly licensed, preferably with the [MIT license][mit-license].
+
+#### Generic Platform Game
+
+- [X] Game can be found at `public/platform.html`
+- [X] Game is playable by one player
+- [X] Game follows rules established in [tutorial](http://eloquentjavascript.net/15_game.html)
+- [X] Game page is linked from `public/index.html`
+
+### Stretch
+
+Design and build your own platform-like game. What else can you build with the techniques you came up with in building the Generic Platform Game?
+
+- [ ] Game has its own HTML, CSS, and JS
+- [ ] Game is playable
+- [ ] Game page is linked from `public/index.html`
+
+## Resources
+
+- MDN: [Introduction to the DOM](https://developer.mozilla.org/en-US/docs/Web/API/Document_Object_Model/Introduction) #html #dom #js
+- MDN: [Guide to Event Handlers](https://developer.mozilla.org/en-US/docs/Web/Guide/Events/Event_handlers) #dom #js
+- Shay Howe: [Learn to Code HTML & CSS](http://learn.shayhowe.com/html-css/) #html #css
+- Tutorial: [Project: A Platform Game](http://eloquentjavascript.net/15_game.html) #js #html #dom
+
+[browser-games]: https://github.com/GuildCrafts/browser-games
+[games-list]: https://github.com/GuildCrafts/browser-games/blob/master/games.md
+[mit-license]: https://opensource.org/licenses/MIT
diff --git a/public/css/platform.css b/public/css/platform.css
index d0ab0f3..ffb3c75 100644
--- a/public/css/platform.css
+++ b/public/css/platform.css
@@ -19,11 +19,17 @@ the grid are used as class names for the table cell (<td>) elements.*/
   background: white;
 }
 
-.actor {position: absolute;}
+.actor {
+  position: absolute;
+}
 
-.coin {background: rgb(241, 229, 89);}
+.coin {
+  background: rgb(241, 229, 89);
+}
 
-.player {background: rgb(64,64,64); }
+.player {
+  background: rgb(64, 64, 64);
+}
 
 .lost .player {
   background: rgb(160, 64, 64);
@@ -38,4 +44,4 @@ the grid are used as class names for the table cell (<td>) elements.*/
   max-width: 600px;
   max-height: 450px;
   position: relative;
-}
+}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 29eadf0..248946b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,22 +1,25 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8">
-    <title>Browser Games</title>
-  </head>
-  <body>
-    <h1>Browser Games</h1>
 
-    <p>A collection of games to play in a web browser.</p>
+<head>
+  <meta charset="utf-8">
+  <title>Browser Games</title>
+</head>
 
-    <hr>
+<body>
+  <h1>Browser Games</h1>
 
-    <nav>
-      <ul>
-        <li><a href="platform.html"> Platform Game</a></li>
-        <li><a>LINK TO SECOND GAME</a></li>
-        <li>...</li>
-      </ul>
-    </nav>
-  </body>
-</html>
+  <p>A collection of games to play in a web browser.</p>
+
+  <hr>
+
+  <nav>
+    <ul>
+      <li><a href="platform.html"> Platform Game</a></li>
+      <li><a>LINK TO SECOND GAME</a></li>
+      <li>...</li>
+    </ul>
+  </nav>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/public/js/platform.js b/public/js/platform.js
index e6ed888..152880b 100644
--- a/public/js/platform.js
+++ b/public/js/platform.js
@@ -1,139 +1,143 @@
 var GAME_LEVELS = [
   ["                                                                                ",
-   "                                                                                ",
-   "                                                                                ",
-   "                                                                                ",
-   "                                                                                ",
-   "                                                                                ",
-   "                                                                  xxx           ",
-   "                                                   xx      xx    xx!xx          ",
-   "                                    o o      xx                  x!!!x          ",
-   "                                                                 xx!xx          ",
-   "                                   xxxxx                          xvx           ",
-   "                                                                            xx  ",
-   "  xx                                      o o                                x  ",
-   "  x                     o                                                    x  ",
-   "  x                                      xxxxx                             o x  ",
-   "  x          xxxx       o                                                    x  ",
-   "  x  @       x  x                                                xxxxx       x  ",
-   "  xxxxxxxxxxxx  xxxxxxxxxxxxxxx   xxxxxxxxxxxxxxxxxxxx     xxxxxxx   xxxxxxxxx  ",
-   "                              x   x                  x     x                    ",
-   "                              x!!!x                  x!!!!!x                    ",
-   "                              x!!!x                  x!!!!!x                    ",
-   "                              xxxxx                  xxxxxxx                    ",
-   "                                                                                ",
-   "                                                                                "],
+    "                                                                                ",
+    "                                                                                ",
+    "                                                                                ",
+    "                                                                                ",
+    "                                                                                ",
+    "                                                                  xxx           ",
+    "                                                   xx      xx    xx!xx          ",
+    "                                    o o      xx                  x!!!x          ",
+    "                                                                 xx!xx          ",
+    "                                   xxxxx                          xvx           ",
+    "                                                                            xx  ",
+    "  xx                                      o o                                x  ",
+    "  x                     o                                                    x  ",
+    "  x                                      xxxxx                             o x  ",
+    "  x          xxxx       o                                                    x  ",
+    "  x  @       x  x                                                xxxxx       x  ",
+    "  xxxxxxxxxxxx  xxxxxxxxxxxxxxx   xxxxxxxxxxxxxxxxxxxx     xxxxxxx   xxxxxxxxx  ",
+    "                              x   x                  x     x                    ",
+    "                              x!!!x                  x!!!!!x                    ",
+    "                              x!!!x                  x!!!!!x                    ",
+    "                              xxxxx                  xxxxxxx                    ",
+    "                                                                                ",
+    "                                                                                "
+  ],
   ["                                      x!!x                        xxxxxxx                                    x!x  ",
-   "                                      x!!x                     xxxx     xxxx                                 x!x  ",
-   "                                      x!!xxxxxxxxxx           xx           xx                                x!x  ",
-   "                                      xx!!!!!!!!!!xx         xx             xx                               x!x  ",
-   "                                       xxxxxxxxxx!!x         x                                    o   o   o  x!x  ",
-   "                                                xx!x         x     o   o                                    xx!x  ",
-   "                                                 x!x         x                                xxxxxxxxxxxxxxx!!x  ",
-   "                                                 xvx         x     x   x                        !!!!!!!!!!!!!!xx  ",
-   "                                                             xx  |   |   |  xx            xxxxxxxxxxxxxxxxxxxxx   ",
-   "                                                              xx!!!!!!!!!!!xx            v                        ",
-   "                                                               xxxx!!!!!xxxx                                      ",
-   "                                               x     x            xxxxxxx        xxx         xxx                  ",
-   "                                               x     x                           x x         x x                  ",
-   "                                               x     x                             x         x                    ",
-   "                                               x     x                             xx        x                    ",
-   "                                               xx    x                             x         x                    ",
-   "                                               x     x      o  o     x   x         x         x                    ",
-   "               xxxxxxx        xxx   xxx        x     x               x   x         x         x                    ",
-   "              xx     xx         x   x          x     x     xxxxxx    x   x   xxxxxxxxx       x                    ",
-   "             xx       xx        x o x          x    xx               x   x   x               x                    ",
-   "     @       x         x        x   x          x     x               x   x   x               x                    ",
-   "    xxx      x         x        x   x          x     x               x   xxxxx   xxxxxx      x                    ",
-   "    x x      x         x       xx o xx         x     x               x     o     x x         x                    ",
-   "!!!!x x!!!!!!x         x!!!!!!xx     xx!!!!!!!!xx    x!!!!!!!!!!     x     =     x x         x                    ",
-   "!!!!x x!!!!!!x         x!!!!!xx       xxxxxxxxxx     x!!!!!!!xx!     xxxxxxxxxxxxx xx  o o  xx                    ",
-   "!!!!x x!!!!!!x         x!!!!!x    o                 xx!!!!!!xx !                    xx     xx                     ",
-   "!!!!x x!!!!!!x         x!!!!!x                     xx!!!!!!xx  !                     xxxxxxx                      ",
-   "!!!!x x!!!!!!x         x!!!!!xx       xxxxxxxxxxxxxx!!!!!!xx   !                                                  ",
-   "!!!!x x!!!!!!x         x!!!!!!xxxxxxxxx!!!!!!!!!!!!!!!!!!xx    !                                                  ",
-   "!!!!x x!!!!!!x         x!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!xx     !                                                  "],
+    "                                      x!!x                     xxxx     xxxx                                 x!x  ",
+    "                                      x!!xxxxxxxxxx           xx           xx                                x!x  ",
+    "                                      xx!!!!!!!!!!xx         xx             xx                               x!x  ",
+    "                                       xxxxxxxxxx!!x         x                                    o   o   o  x!x  ",
+    "                                                xx!x         x     o   o                                    xx!x  ",
+    "                                                 x!x         x                                xxxxxxxxxxxxxxx!!x  ",
+    "                                                 xvx         x     x   x                        !!!!!!!!!!!!!!xx  ",
+    "                                                             xx  |   |   |  xx            xxxxxxxxxxxxxxxxxxxxx   ",
+    "                                                              xx!!!!!!!!!!!xx            v                        ",
+    "                                                               xxxx!!!!!xxxx                                      ",
+    "                                               x     x            xxxxxxx        xxx         xxx                  ",
+    "                                               x     x                           x x         x x                  ",
+    "                                               x     x                             x         x                    ",
+    "                                               x     x                             xx        x                    ",
+    "                                               xx    x                             x         x                    ",
+    "                                               x     x      o  o     x   x         x         x                    ",
+    "               xxxxxxx        xxx   xxx        x     x               x   x         x         x                    ",
+    "              xx     xx         x   x          x     x     xxxxxx    x   x   xxxxxxxxx       x                    ",
+    "             xx       xx        x o x          x    xx               x   x   x               x                    ",
+    "     @       x         x        x   x          x     x               x   x   x               x                    ",
+    "    xxx      x         x        x   x          x     x               x   xxxxx   xxxxxx      x                    ",
+    "    x x      x         x       xx o xx         x     x               x     o     x x         x                    ",
+    "!!!!x x!!!!!!x         x!!!!!!xx     xx!!!!!!!!xx    x!!!!!!!!!!     x     =     x x         x                    ",
+    "!!!!x x!!!!!!x         x!!!!!xx       xxxxxxxxxx     x!!!!!!!xx!     xxxxxxxxxxxxx xx  o o  xx                    ",
+    "!!!!x x!!!!!!x         x!!!!!x    o                 xx!!!!!!xx !                    xx     xx                     ",
+    "!!!!x x!!!!!!x         x!!!!!x                     xx!!!!!!xx  !                     xxxxxxx                      ",
+    "!!!!x x!!!!!!x         x!!!!!xx       xxxxxxxxxxxxxx!!!!!!xx   !                                                  ",
+    "!!!!x x!!!!!!x         x!!!!!!xxxxxxxxx!!!!!!!!!!!!!!!!!!xx    !                                                  ",
+    "!!!!x x!!!!!!x         x!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!xx     !                                                  "
+  ],
   ["                                                                                                              ",
-   "                                                                                                              ",
-   "                                                                                                              ",
-   "                                                                                                              ",
-   "                                                                                                              ",
-   "                                        o                                                                     ",
-   "                                                                                                              ",
-   "                                        x                                                                     ",
-   "                                        x                                                                     ",
-   "                                        x                                                                     ",
-   "                                        x                                                                     ",
-   "                                       xxx                                                                    ",
-   "                                       x x                 !!!        !!!  xxx                                ",
-   "                                       x x                 !x!        !x!                                     ",
-   "                                     xxx xxx                x          x                                      ",
-   "                                      x   x                 x   oooo   x       xxx                            ",
-   "                                      x   x                 x          x      x!!!x                           ",
-   "                                      x   x                 xxxxxxxxxxxx       xxx                            ",
-   "                                     xx   xx      x   x      x                                                ",
-   "                                      x   xxxxxxxxx   xxxxxxxx              x x                               ",
-   "                                      x   x           x                    x!!!x                              ",
-   "                                      x   x           x                     xxx                               ",
-   "                                     xx   xx          x                                                       ",
-   "                                      x   x= = = =    x            xxx                                        ",
-   "                                      x   x           x           x!!!x                                       ",
-   "                                      x   x    = = = =x     o      xxx       xxx                              ",
-   "                                     xx   xx          x                     x!!!x                             ",
-   "                              o   o   x   x           x     x                xxv        xxx                   ",
-   "                                      x   x           x              x                 x!!!x                  ",
-   "                             xxx xxx xxx xxx     o o  x!!!!!!!!!!!!!!x                   vx                   ",
-   "                             x xxx x x xxx x          x!!!!!!!!!!!!!!x                                        ",
-   "                             x             x   xxxxxxxxxxxxxxxxxxxxxxx                                        ",
-   "                             xx           xx                                         xxx                      ",
-   "  xxx                         x     x     x                                         x!!!x                xxx  ",
-   "  x x                         x    xxx    x                                          xxx                 x x  ",
-   "  x                           x    xxx    xxxxxxx                        xxxxx                             x  ",
-   "  x                           x           x                              x   x                             x  ",
-   "  x                           xx          x                              x x x                             x  ",
-   "  x                                       x       |xxxx|    |xxxx|     xxx xxx                             x  ",
-   "  x                xxx             o o    x                              x         xxx                     x  ",
-   "  x               xxxxx       xx          x                             xxx       x!!!x          x         x  ",
-   "  x               oxxxo       x    xxx    x                             x x        xxx          xxx        x  ",
-   "  x                xxx        xxxxxxxxxxxxx  x oo x    x oo x    x oo  xx xx                    xxx        x  ",
-   "  x      @          x         x           x!!x    x!!!!x    x!!!!x    xx   xx                    x         x  ",
-   "  xxxxxxxxxxxxxxxxxxxxxxxxxxxxx           xxxxxxxxxxxxxxxxxxxxxxxxxxxxx     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx  ",
-   "                                                                                                              ",
-   "                                                                                                              "],
+    "                                                                                                              ",
+    "                                                                                                              ",
+    "                                                                                                              ",
+    "                                                                                                              ",
+    "                                        o                                                                     ",
+    "                                                                                                              ",
+    "                                        x                                                                     ",
+    "                                        x                                                                     ",
+    "                                        x                                                                     ",
+    "                                        x                                                                     ",
+    "                                       xxx                                                                    ",
+    "                                       x x                 !!!        !!!  xxx                                ",
+    "                                       x x                 !x!        !x!                                     ",
+    "                                     xxx xxx                x          x                                      ",
+    "                                      x   x                 x   oooo   x       xxx                            ",
+    "                                      x   x                 x          x      x!!!x                           ",
+    "                                      x   x                 xxxxxxxxxxxx       xxx                            ",
+    "                                     xx   xx      x   x      x                                                ",
+    "                                      x   xxxxxxxxx   xxxxxxxx              x x                               ",
+    "                                      x   x           x                    x!!!x                              ",
+    "                                      x   x           x                     xxx                               ",
+    "                                     xx   xx          x                                                       ",
+    "                                      x   x= = = =    x            xxx                                        ",
+    "                                      x   x           x           x!!!x                                       ",
+    "                                      x   x    = = = =x     o      xxx       xxx                              ",
+    "                                     xx   xx          x                     x!!!x                             ",
+    "                              o   o   x   x           x     x                xxv        xxx                   ",
+    "                                      x   x           x              x                 x!!!x                  ",
+    "                             xxx xxx xxx xxx     o o  x!!!!!!!!!!!!!!x                   vx                   ",
+    "                             x xxx x x xxx x          x!!!!!!!!!!!!!!x                                        ",
+    "                             x             x   xxxxxxxxxxxxxxxxxxxxxxx                                        ",
+    "                             xx           xx                                         xxx                      ",
+    "  xxx                         x     x     x                                         x!!!x                xxx  ",
+    "  x x                         x    xxx    x                                          xxx                 x x  ",
+    "  x                           x    xxx    xxxxxxx                        xxxxx                             x  ",
+    "  x                           x           x                              x   x                             x  ",
+    "  x                           xx          x                              x x x                             x  ",
+    "  x                                       x       |xxxx|    |xxxx|     xxx xxx                             x  ",
+    "  x                xxx             o o    x                              x         xxx                     x  ",
+    "  x               xxxxx       xx          x                             xxx       x!!!x          x         x  ",
+    "  x               oxxxo       x    xxx    x                             x x        xxx          xxx        x  ",
+    "  x                xxx        xxxxxxxxxxxxx  x oo x    x oo x    x oo  xx xx                    xxx        x  ",
+    "  x      @          x         x           x!!x    x!!!!x    x!!!!x    xx   xx                    x         x  ",
+    "  xxxxxxxxxxxxxxxxxxxxxxxxxxxxx           xxxxxxxxxxxxxxxxxxxxxxxxxxxxx     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx  ",
+    "                                                                                                              ",
+    "                                                                                                              "
+  ],
   ["                                                                                                  xxx x       ",
-   "                                                                                                      x       ",
-   "                                                                                                  xxxxx       ",
-   "                                                                                                  x           ",
-   "                                                                                                  x xxx       ",
-   "                          o                                                                       x x x       ",
-   "                                                                                             o o oxxx x       ",
-   "                   xxx                                                                                x       ",
-   "       !  o  !                                                xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx       ",
-   "       x     x                                                x   x x   x x   x x   x x   x x   x x           ",
-   "       x= o  x            x                                   xxx x xxx x xxx x xxx x xxx x xxx x xxxxx       ",
-   "       x     x                                                  x x   x x   x x   x x   x x   x x     x       ",
-   "       !  o  !            o                                  xxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxxxx       ",
-   "                                                                                                              ",
-   "          o              xxx                              xx                                                  ",
-   "                                                                                                              ",
-   "                                                                                                              ",
-   "                                                      xx                                                      ",
-   "                   xxx         xxx                                                                            ",
-   "                                                                                                              ",
-   "                          o                                                     x      x                      ",
-   "                                                          xx     xx                                           ",
-   "             xxx         xxx         xxx                                 x                  x                 ",
-   "                                                                                                              ",
-   "                                                                 ||                                           ",
-   "  xxxxxxxxxxx                                                                                                 ",
-   "  x         x o xxxxxxxxx o xxxxxxxxx o xx                                                x                   ",
-   "  x         x   x       x   x       x   x                 ||                  x     x                         ",
-   "  x  @      xxxxx   o   xxxxx   o   xxxxx                                                                     ",
-   "  xxxxxxx                                     xxxxx       xx     xx     xxx                                   ",
-   "        x=                  =                =x   x                     xxx                                   ",
-   "        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx   x!!!!!!!!!!!!!!!!!!!!!xxx!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
-   "                                                  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
-   "                                                                                                              "]
+    "                                                                                                      x       ",
+    "                                                                                                  xxxxx       ",
+    "                                                                                                  x           ",
+    "                                                                                                  x xxx       ",
+    "                          o                                                                       x x x       ",
+    "                                                                                             o o oxxx x       ",
+    "                   xxx                                                                                x       ",
+    "       !  o  !                                                xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx       ",
+    "       x     x                                                x   x x   x x   x x   x x   x x   x x           ",
+    "       x= o  x            x                                   xxx x xxx x xxx x xxx x xxx x xxx x xxxxx       ",
+    "       x     x                                                  x x   x x   x x   x x   x x   x x     x       ",
+    "       !  o  !            o                                  xxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxxxx       ",
+    "                                                                                                              ",
+    "          o              xxx                              xx                                                  ",
+    "                                                                                                              ",
+    "                                                                                                              ",
+    "                                                      xx                                                      ",
+    "                   xxx         xxx                                                                            ",
+    "                                                                                                              ",
+    "                          o                                                     x      x                      ",
+    "                                                          xx     xx                                           ",
+    "             xxx         xxx         xxx                                 x                  x                 ",
+    "                                                                                                              ",
+    "                                                                 ||                                           ",
+    "  xxxxxxxxxxx                                                                                                 ",
+    "  x         x o xxxxxxxxx o xxxxxxxxx o xx                                                x                   ",
+    "  x         x   x       x   x       x   x                 ||                  x     x                         ",
+    "  x  @      xxxxx   o   xxxxx   o   xxxxx                                                                     ",
+    "  xxxxxxx                                     xxxxx       xx     xx     xxx                                   ",
+    "        x=                  =                =x   x                     xxx                                   ",
+    "        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx   x!!!!!!!!!!!!!!!!!!!!!xxx!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
+    "                                                  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+    "                                                                                                              "
+  ]
 ];
 
 
@@ -144,9 +148,11 @@ function Level(plan) {
   this.actors = [];
 
   for (var y = 0; y < this.height; y++) {
-    var line = plan[y], gridLine = [];
+    var line = plan[y],
+      gridLine = [];
     for (var x = 0; x < this.width; x++) {
-      var ch = line[x], fieldType = null;
+      var ch = line[x],
+        fieldType = null;
       var Actor = actorChars[ch];
       if (Actor)
         this.actors.push(new Actor(new Vector(x, y), ch));
@@ -170,7 +176,8 @@ Level.prototype.isFinished = function() {
 };
 
 function Vector(x, y) {
-  this.x = x; this.y = y;
+  this.x = x;
+  this.y = y;
 }
 Vector.prototype.plus = function(other) {
   return new Vector(this.x + other.x, this.y + other.y);
@@ -182,7 +189,9 @@ Vector.prototype.times = function(factor) {
 var actorChars = {
   "@": Player,
   "o": Coin,
-  "=": Lava, "|": Lava, "v": Lava
+  "=": Lava,
+  "|": Lava,
+  "v": Lava
 };
 
 function Player(pos) {
@@ -249,7 +258,7 @@ DOMDisplay.prototype.drawActors = function() {
   var wrap = elt("div");
   this.level.actors.forEach(function(actor) {
     var rect = wrap.appendChild(elt("div",
-                                    "actor " + actor.type));
+      "actor " + actor.type));
     rect.style.width = actor.size.x * scale + "px";
     rect.style.height = actor.size.y * scale + "px";
     rect.style.left = actor.pos.x * scale + "px";
@@ -272,12 +281,14 @@ DOMDisplay.prototype.scrollPlayerIntoView = function() {
   var margin = width / 3;
 
   // The viewport
-  var left = this.wrap.scrollLeft, right = left + width;
-  var top = this.wrap.scrollTop, bottom = top + height;
+  var left = this.wrap.scrollLeft,
+    right = left + width;
+  var top = this.wrap.scrollTop,
+    bottom = top + height;
 
   var player = this.level.player;
   var center = player.pos.plus(player.size.times(0.5))
-                 .times(scale);
+    .times(scale);
 
   if (center.x < left + margin)
     this.wrap.scrollLeft = center.x - margin;
@@ -315,10 +326,10 @@ Level.prototype.actorAt = function(actor) {
   for (var i = 0; i < this.actors.length; i++) {
     var other = this.actors[i];
     if (other != actor &&
-        actor.pos.x + actor.size.x > other.pos.x &&
-        actor.pos.x < other.pos.x + other.size.x &&
-        actor.pos.y + actor.size.y > other.pos.y &&
-        actor.pos.y < other.pos.y + other.size.y)
+      actor.pos.x + actor.size.x > other.pos.x &&
+      actor.pos.x < other.pos.x + other.size.x &&
+      actor.pos.y + actor.size.y > other.pos.y &&
+      actor.pos.y < other.pos.y + other.size.y)
       return other;
   }
 };
@@ -348,7 +359,8 @@ Lava.prototype.act = function(step, level) {
     this.speed = this.speed.times(-1);
 };
 
-var wobbleSpeed = 8, wobbleDist = 0.07;
+var wobbleSpeed = 8,
+  wobbleDist = 0.07;
 
 Coin.prototype.act = function(step) {
   this.wobble += step * wobbleSpeed;
@@ -415,18 +427,23 @@ Level.prototype.playerTouched = function(type, actor) {
       return other != actor;
     });
     if (!this.actors.some(function(actor) {
-      return actor.type == "coin";
-    })) {
+        return actor.type == "coin";
+      })) {
       this.status = "won";
       this.finishDelay = 1;
     }
   }
 };
 
-var arrowCodes = {37: "left", 38: "up", 39: "right"};
+var arrowCodes = {
+  37: "left",
+  38: "up",
+  39: "right"
+};
 
 function trackKeys(codes) {
   var pressed = Object.create(null);
+
   function handler(event) {
     if (codes.hasOwnProperty(event.keyCode)) {
       var down = event.type == "keydown";
@@ -441,6 +458,7 @@ function trackKeys(codes) {
 
 function runAnimation(frameFunc) {
   var lastTime = null;
+
   function frame(time) {
     var stop = false;
     if (lastTime != null) {
@@ -488,4 +506,4 @@ function runGame(plans, Display) {
     });
   }
   startLevel(0, 3);
-}
+}
\ No newline at end of file
diff --git a/public/platform.html b/public/platform.html
index e40b6e0..972a032 100644
--- a/public/platform.html
+++ b/public/platform.html
@@ -12,9 +12,9 @@
 <body>
 
   <script>
-  runGame(GAME_LEVELS, DOMDisplay);
+    runGame(GAME_LEVELS, DOMDisplay);
   </script>
 
 </body>
 
-</html>
+</html>
\ No newline at end of file

From 473fe789478e93e19099cabd4f1649d303c90c74 Mon Sep 17 00:00:00 2001
From: Jacklyne Bouier <jacklynebouier@Jacklynes-Mac-mini.local>
Date: Thu, 11 May 2017 11:43:21 -0700
Subject: [PATCH 3/3] changed css color to alphabetized colors

---
 public/css/platform.css | 14 +++++++-------
 public/platform.html    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/css/platform.css b/public/css/platform.css
index ffb3c75..2746829 100644
--- a/public/css/platform.css
+++ b/public/css/platform.css
@@ -2,7 +2,7 @@
 the grid are used as class names for the table cell (<td>) elements.*/
 
 .background {
-  background: rgb(52, 166, 251);
+  background: #33a6fb;
   table-layout: fixed;
   border-spacing: 0;
 }
@@ -12,11 +12,11 @@ the grid are used as class names for the table cell (<td>) elements.*/
 }
 
 .lava {
-  background: rgb(255, 100, 100);
+  background: #ff6363;
 }
 
 .wall {
-  background: white;
+  background: #ffffff;
 }
 
 .actor {
@@ -24,15 +24,15 @@ the grid are used as class names for the table cell (<td>) elements.*/
 }
 
 .coin {
-  background: rgb(241, 229, 89);
+  background: #f1e559;
 }
 
 .player {
-  background: rgb(64, 64, 64);
+  background: #404040;
 }
 
 .lost .player {
-  background: rgb(160, 64, 64);
+  background: #9f4141;
 }
 
 .won .player {
@@ -44,4 +44,4 @@ the grid are used as class names for the table cell (<td>) elements.*/
   max-width: 600px;
   max-height: 450px;
   position: relative;
-}
\ No newline at end of file
+}
diff --git a/public/platform.html b/public/platform.html
index 972a032..6b95dda 100644
--- a/public/platform.html
+++ b/public/platform.html
@@ -17,4 +17,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>