Merge pull request #21 from erosilk/gh-pages

Add auto-shifting
Aerolab · Aug 6, 2017 · a38129e · a38129e · mikirobles · Aug 7, 2017
2 parents 150d3af + 4314a91
commit a38129e
Show file tree

Hide file tree

Showing 7 changed files with 2,671 additions and 8 deletions.
diff --git a/dist/README.md b/dist/README.md
@@ -21,7 +21,7 @@ Then you just include **jquery** and **blockrain** and setup the game with **$('
 
 ```html
 <!-- The stylesheet should go in the <head>, or be included in your CSS -->
-<link rel="stylesheet" src="blockrain.css">
+<link rel="stylesheet" href="blockrain.css">
 
 <!-- jQuery and Blockrain.js -->
 <script src="jquery.js"></script>

diff --git a/dist/blockrain.jquery.js b/dist/blockrain.jquery.js
@@ -447,11 +447,51 @@
           orientation: 0, // 4 possible
 
           rotate: function(direction) {
-            var orientation = (this.orientation + (direction === 'left' ? 1 : -1) + 4) % 4;
+            var orientation =
+              (this.orientation + (direction === "left" ? 1 : -1) + 4) % 4;
+
+            if (!game._checkCollisions(
+                this.x,
+                this.y,
+                this.getBlocks(orientation)
+              )) {
+              this.orientation = orientation;
+              game._board.renderChanged = true;
+            } else {
+              var ogOrientation = this.orientation;
+              var ogX = this.x;
+              var ogY = this.y;
 
-            //TODO - when past limit - auto shift and remember that too!
-            if (!game._checkCollisions(this.x, this.y, this.getBlocks(orientation))) {
               this.orientation = orientation;
+
+              while (this.x >= game._BLOCK_WIDTH - 2) {
+                this.x--;
+              }
+              while (this.x < 0) {
+                this.x++;
+              }
+
+              if (this.blockType === "line" && this.x === 0) this.x++;
+
+              if ( game._checkCollisions(
+                  this.x,
+                  this.y,
+                  this.getBlocks(orientation)
+                )
+              ) {
+                this.y--;
+                if (
+                    game._checkCollisions(
+                      this.x,
+                      this.y,
+                      this.getBlocks(orientation)
+                    )
+                ) {
+                    this.x = ogX;
+                    this.y = ogY;
+                    this.orientation = ogOrientation;
+                }
+              }
               game._board.renderChanged = true;
             }
           },

diff --git a/dist/blockrain.jquery.min.js b/dist/blockrain.jquery.min.js
diff --git a/dist/blockrain.zip b/dist/blockrain.zip