Merge frustration

Author: stasinos

LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 Jake Gordon and contributors
-Copyright (c) 2017, Stasinos Konstantopoulos
+Copyright (c) 2017, 2018 Stasinos Konstantopoulos
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,14 +2,7 @@ Frustrating Tetris
 ==================
 
 An HTML5 Frustrating Tetris Game
-
-Forked from https://github.com/jakesgordon/javascript-tetris
-into https://github.com/stasinos/javascript-tetris
-for pull requests of fixes and new features for the normal game.
-
-Forked again into https://bitbucket.org/stasinos/frustretris
-(private repo) for developing the "frustrating tetris" features.
-
+forked from https://github.com/jakesgordon/javascript-tetris
 
 Added features:
 

index.html

@@ -69,7 +69,7 @@
     // game constants
     //-------------------------------------------------------------------------
 
-    var KEY     = { ESC: 27, SPACE: 32, LEFT: 37, UP: 38, RIGHT: 39, DOWN: 40, SHIFT: 16 },
+    var KEY     = { ESC: 27, SPACE: 32, LEFT: 37, UP: 38, RIGHT: 39, DOWN: 40, SHIFT: 16, P: 80 },
 	// drop all the way to BOTTOM is an action
 	// IGNORE subsequent actions is also an action
 	// BUT: MAX=3 to avoid reaching these two pseudo-actions by rotation
@@ -80,6 +80,7 @@
         ucanvas = get('upcoming'),
         uctx    = ucanvas.getContext('2d'),
         speed   = { start: 0.6, decrement: 0.005, min: 0.1 }, // how long before piece drops by 1 row (seconds)
+        paused  = 0,
         nx      = 10, // width of tetris court (in blocks)
         ny      = 20, // height of tetris court (in blocks)
         nu      = 5,  // width/height of upcoming preview (in blocks)
@@ -260,6 +261,16 @@
                   actions.push(DIR.BOTTOM); handled = true;
  	        }
 	        break;
+              case KEY.ESC:   lose();                   handled = true; break;
+              case KEY.P:
+                if( paused == 1 ) {
+                    paused = 0;
+                }
+                else {
+                    paused = 1;
+                }
+                handled = true;
+                break;
             }
           }
 	}
@@ -354,6 +365,9 @@
     }
 
     function drop() {
+      if( paused == 0 ) {
+        console.log( "0" );
+      
       if (!move(DIR.DOWN)) {
         addScore(10);
         dropPiece();
@@ -365,6 +379,7 @@
           lose();
         }
       }
+      } // paused
     }
 
     function dropMany() {