make actuator properly create html elements
make actuator properly create html elements

file:b/.jshintrc (new)
--- /dev/null
+++ b/.jshintrc
@@ -1,1 +1,20 @@
+{
+    "esnext": true,
+    "indent": 2,
+    "maxlen": 80,
+    "freeze": true,
+    "camelcase": true,
+    "unused": true,
+    "eqnull": true,
+    "proto": true,
+    "supernew": true,
+    "noyield": true,
+    "evil": true,
+    "node": true,
+    "boss": true,
+    "expr": true,
+    "loopfunc": true,
+    "white": true,
+    "maxdepth": 4
+}
 

file:a/README.md -> file:b/README.md
--- a/README.md
+++ b/README.md
@@ -3,5 +3,5 @@
 
 Made just for fun.
 
-[![Screenshot](http://pictures.gabrielecirulli.com/2048-20140305-170629.png)](http://pictures.gabrielecirulli.com/2048-20140305-170629.png)
+[![Screenshot](http://pictures.gabrielecirulli.com/2048-20140305-231246.png)](http://pictures.gabrielecirulli.com/2048-20140305-231246.png)
 

file:a/index.html -> file:b/index.html
--- a/index.html
+++ b/index.html
@@ -5,10 +5,17 @@
   <title>2048</title>
 
   <link href="style/main.css" rel="stylesheet" type="text/css">
+
+  <script src="js/html_actuator.js"></script>
+  <script src="js/grid.js"></script>
+  <script src="js/tile.js"></script>
+  <script src="js/game_manager.js"></script>
+  <script src="js/application.js"></script>
 </head>
 <body>
   <div class="container">
     <h1>2048</h1>
+    <p class="game-intro">Join the numbers and get to the <strong>2048 tile!</strong></p>
 
     <div class="game-container">
       <div class="grid-container">
@@ -39,41 +46,17 @@
       </div>
 
       <div class="tile-container">
-        <div class="tile tile-2 tile-position-1-1">
-          2
-        </div>
-        <div class="tile tile-4 tile-position-2-1">
-          4
-        </div>
-        <div class="tile tile-8 tile-position-3-1">
-          8
-        </div>
-        <div class="tile tile-16 tile-position-4-1">
-          16
-        </div>
-        <div class="tile tile-32 tile-position-1-2">
-          32
-        </div>
-        <div class="tile tile-64 tile-position-2-2">
-          64
-        </div>
-        <div class="tile tile-128 tile-position-3-2">
-          128
-        </div>
-        <div class="tile tile-256 tile-position-4-2">
-          256
-        </div>
-        <div class="tile tile-512 tile-position-1-3">
-          512
-        </div>
-        <div class="tile tile-1024 tile-position-2-3">
-          1024
-        </div>
-        <div class="tile tile-2048 tile-position-3-3">
-          2048
-        </div>
+
       </div>
     </div>
+
+    <p class="game-explanation">
+      <strong class="important">How to play:</strong> Use your <strong>arrow keys</strong> to move the tiles. When two tiles with the same number touch, they <strong>merge into one!</strong>
+    </p>
+    <hr>
+    <p>
+      Created by <a href="http://gabrielecirulli.com" target="_blank">Gabriele Cirulli.</a> Based on <a href="https://itunes.apple.com/us/app/1024!/id823499224" target="_blank">1024 by Veewo Studio.</a>
+    </p>
   </div>
 </body>
 </html>

file:b/js/application.js (new)
--- /dev/null
+++ b/js/application.js
@@ -1,1 +1,5 @@
+document.addEventListener("DOMContentLoaded", function () {
+  var actuator = new HTMLActuator;
+  var manager  = new GameManager(4, actuator);
+});
 

--- /dev/null
+++ b/js/game_manager.js
@@ -1,1 +1,45 @@
+function GameManager(size, actuator) {
+  this.size       = size; // Grid size
+  this.actuator   = actuator;
 
+  this.startTiles = 2;
+  this.grid       = new Grid(this.size);
+
+  this.setup();
+}
+
+// Set up the game
+GameManager.prototype.setup = function () {
+  this.addStartTiles();
+
+  // Update the actuator
+  this.actuate();
+};
+
+// Set up the initial tiles to start the game with
+GameManager.prototype.addStartTiles = function () {
+  for (var i = 0; i < this.startTiles; i++) {
+    this.addRandomTile();
+  }
+};
+
+// Adds a tile in a random position
+GameManager.prototype.addRandomTile = function () {
+  var value = Math.random() < 0.9 ? 2 : 4;
+  var tile = new Tile(this.grid.randomAvailableCell(), value);
+  
+  this.grid.insertTile(tile);
+};
+
+// Sends the updated grid to the actuator
+GameManager.prototype.actuate = function () {
+  this.actuator.actuate(this.grid);
+};
+
+// Move the grid in the specified direction
+GameManager.prototype.move = function (direction) {
+  // 0: up, 1: right, 2:down, 3: left
+
+  this.actuate();
+};
+

file:b/js/grid.js (new)
--- /dev/null
+++ b/js/grid.js
@@ -1,1 +1,58 @@
+function Grid(size) {
+  this.size = size;
 
+  this.cells = [];
+
+  this.build();
+}
+
+// Build a grid of the specified size
+Grid.prototype.build = function () {
+  for (var x = 0; x < this.size; x++) {
+    var row = this.cells[x] = [];
+
+    for (var y = 0; y < this.size; y++) {
+      row.push(null);
+    }
+  }
+};
+
+// Find the first available random position
+Grid.prototype.randomAvailableCell = function () {
+  var cells = this.availableCells();
+
+  if (cells.length) {
+    return cells[Math.floor(Math.random() * cells.length)];
+  }
+};
+
+Grid.prototype.availableCells = function () {
+  var cells = [];
+
+  for (var x = 0; x < this.size; x++) {
+    for (var y = 0; y < this.size; y++) {
+      var cell = { x: x, y: y };
+
+      if (this.cellAvailable(cell)) {
+        cells.push(cell);
+      }
+    }
+  }
+
+  return cells;
+};
+
+// Check if the specified cell is taken
+Grid.prototype.cellAvailable = function (cell) {
+  return !this.cellOccupied(cell);
+};
+
+Grid.prototype.cellOccupied = function (cell) {
+  return !!this.cells[cell.x][cell.y];
+};
+
+// Inserts a tile at its position
+Grid.prototype.insertTile = function (tile) {
+  this.cells[tile.x][tile.y] = tile;
+};
+

--- /dev/null
+++ b/js/html_actuator.js
@@ -1,1 +1,37 @@
+function HTMLActuator() {
+  this.tileContainer = document.getElementsByClassName("tile-container")[0];
+}
 
+HTMLActuator.prototype.actuate = function (grid) {
+  var self = this;
+
+  this.clearContainer();
+
+  grid.cells.forEach(function (column) {
+    column.forEach(function (cell) {
+      if (cell) {
+        self.addTile(cell);
+      }
+    });
+  });
+};
+
+HTMLActuator.prototype.clearContainer = function () {
+  while (this.tileContainer.firstChild) {
+    this.tileContainer.removeChild(this.tileContainer.firstChild);
+  }
+};
+
+HTMLActuator.prototype.addTile = function (tile) {
+  var element = document.createElement("div");
+
+  var x = tile.x + 1;
+  var y = tile.y + 1;
+  var position = "tile-position-" + x + "-" + y;
+
+  element.classList.add("tile", "tile-" + tile.value, position);
+  element.textContent = tile.value;
+
+  this.tileContainer.appendChild(element);
+};
+

file:b/js/tile.js (new)
--- /dev/null
+++ b/js/tile.js
@@ -1,1 +1,8 @@
+function Tile(position, value) {
+  this.x                = position.x;
+  this.y                = position.y;
+  this.value            = value || 2;
 
+  this.previousPosition = null;
+}
+

--- a/style/main.css
+++ b/style/main.css
@@ -4,7 +4,8 @@
   padding: 0;
   background: #faf8ef;
   color: #776e65;
-  font-family: "Clear Sans", "Helvetica Neue", Arial, sans-serif; }
+  font-family: "Clear Sans", "Helvetica Neue", Arial, sans-serif;
+  font-size: 18px; }
 
 body {
   margin: 80px 0; }
@@ -14,12 +15,31 @@
   font-weight: bold;
   margin: 0; }
 
+p {
+  margin-top: 0;
+  margin-bottom: 10px;
+  line-height: 1.65; }
+
+a {
+  color: #776e65;
+  font-weight: bold;
+  text-decoration: underline; }
+
+strong.important {
+  text-transform: uppercase; }
+
+hr {
+  border: none;
+  border-bottom: 1px solid #d8d4d0;
+  margin-top: 20px;
+  margin-bottom: 30px; }
+
 .container {
   width: 500px;
   margin: 0 auto; }
 
 .game-container {
-  margin-top: 50px;
+  margin-top: 40px;
   position: relative;
   padding: 15px;
   cursor: default;
@@ -144,39 +164,50 @@
     background: #ede0c8;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
   .tile.tile-8 {
-    background: #edddb7;
+    color: #f9f6f2;
+    background: #f2b179;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
   .tile.tile-16 {
-    background: #edd9a6;
+    color: #f9f6f2;
+    background: #f59563;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
   .tile.tile-32 {
-    background: #edd695;
+    color: #f9f6f2;
+    background: #f67c5f;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.07937), inset 0 0 0 1px rgba(255, 255, 255, 0.04762); }
   .tile.tile-64 {
-    background: #edd384;
+    color: #f9f6f2;
+    background: #f65e3b;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.15873), inset 0 0 0 1px rgba(255, 255, 255, 0.09524); }
   .tile.tile-128 {
+    color: #f9f6f2;
     background: #edcf72;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.2381), inset 0 0 0 1px rgba(255, 255, 255, 0.14286);
     font-size: 45px; }
   .tile.tile-256 {
+    color: #f9f6f2;
     background: #edcc61;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.31746), inset 0 0 0 1px rgba(255, 255, 255, 0.19048);
-    color: #ede9e5;
     font-size: 45px; }
   .tile.tile-512 {
+    color: #f9f6f2;
     background: #edc850;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.39683), inset 0 0 0 1px rgba(255, 255, 255, 0.2381);
-    color: #f9f6f2;
     font-size: 45px; }
   .tile.tile-1024 {
+    color: #f9f6f2;
     background: #edc53f;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.47619), inset 0 0 0 1px rgba(255, 255, 255, 0.28571);
-    color: #f9f6f2;
     font-size: 35px; }
   .tile.tile-2048 {
+    color: #f9f6f2;
     background: #edc22e;
     box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.55556), inset 0 0 0 1px rgba(255, 255, 255, 0.33333);
-    color: #f9f6f2;
     font-size: 35px; }
 
+.game-intro {
+  margin-bottom: 0; }
+
+.game-explanation {
+  margin-top: 50px; }
+

--- a/style/main.scss
+++ b/style/main.scss
@@ -8,7 +8,7 @@
 $tile-border-radius: 3px;
 
 $text-color: #776E65;
-$gold-text-color: #f9f6f2;
+$bright-text-color: #f9f6f2;
 
 $tile-color: #eee4da;
 $tile-gold-color: #edc22e;
@@ -21,6 +21,7 @@
   background: #faf8ef;
   color: $text-color;
   font-family: "Clear Sans", "Helvetica Neue", Arial, sans-serif;
+  font-size: 18px;
 }
 
 body {
@@ -33,13 +34,38 @@
   margin: 0;
 }
 
+p {
+  margin-top: 0;
+  margin-bottom: 10px;
+  line-height: 1.65;
+}
+
+a {
+  color: $text-color;
+  font-weight: bold;
+  text-decoration: underline;
+}
+
+strong {
+  &.important {
+    text-transform: uppercase;
+  }
+}
+
+hr {
+  border: none;
+  border-bottom: 1px solid lighten($text-color, 40%);
+  margin-top: 20px;
+  margin-bottom: 30px;
+}
+
 .container {
   width: $field-width;
   margin: 0 auto;
 }
 
 .game-container {
-  margin-top: 50px;
+  margin-top: 40px;
   position: relative;
   padding: $grid-spacing;
 
@@ -109,6 +135,7 @@
   @include transition(200ms ease);
   @include transition-property(top, left);
 
+  // Build position classes
   @for $x from 1 through $grid-row-cells {
     @for $y from 1 through $grid-row-cells {
       &.tile-position-#{$x}-#{$y} {
@@ -123,25 +150,50 @@
   $exponent: 1;
   $limit: 11;
 
+  // Colors for all 11 states, false = no special color
+  $special-colors: false false, // 2
+                   false false, // 4
+                   #f78e48 true, // 8
+                   #fc5e2e true, // 16
+                   #ff3333 true, // 32
+                   #ff0000 true, // 64
+                   false true, // 128
+                   false true, // 256
+                   false true, // 512
+                   false true, // 1024
+                   false true; // 2048
+
+  // Build tile colors
   @while $exponent <= $limit {
     $power: pow($base, $exponent);
 
-    $gold-percent: ($exponent - 1) / ($limit - 1) * 100;
-
-    $gold-text-percent: min($exponent + 2, $limit) / ($limit) * 100;
-
-    $glow-opacity: max($exponent - 4, 0) / ($limit - 4);
-
     &.tile-#{$power} {
-      background: mix($tile-gold-color, $tile-color, $gold-percent);
-
+      // Calculate base background color
+      $gold-percent: ($exponent - 1) / ($limit - 1) * 100;
+      $mixed-background: mix($tile-gold-color, $tile-color, $gold-percent);
+
+      $nth-color: nth($special-colors, $exponent);
+
+      $special-background: nth($nth-color, 1);
+      $bright-color: nth($nth-color, 2);
+
+      @if $special-background {
+        $mixed-background: mix($special-background, $mixed-background, 55%);
+      }
+
+      @if $bright-color {
+        color: $bright-text-color;
+      }
+
+      // Set background
+      background: $mixed-background;
+
+      // Add glow
+      $glow-opacity: max($exponent - 4, 0) / ($limit - 4);
       box-shadow: 0 0 30px 10px rgba($tile-gold-glow-color, $glow-opacity / 1.8),
                   inset 0 0 0 1px rgba(white, $glow-opacity / 3);
 
-      @if $exponent >= 8 {
-        color: mix($gold-text-color, $text-color, $gold-text-percent);
-      }
-
+      // Adjust font size for bigger numbers
       @if $power >= 100 and $power < 1000 {
         font-size: 45px;
       } @else if $power >= 1000 {
@@ -153,5 +205,11 @@
   }
 }
 
-
-
+.game-intro {
+  margin-bottom: 0;
+}
+
+.game-explanation {
+  margin-top: 50px;
+}
+

comments