From 6f27db0588f1608b0e0fe48333fb7c8a3f7c7b58 Mon Sep 17 00:00:00 2001 From: "PolicyChanges1@gmail.com" Date: Sat, 13 Mar 2021 07:34:58 -0500 Subject: [PATCH] sequence editor start --- dist/sound/Affirm2.ogg | Bin 0 -> 15193 bytes dist/tetrion.js | 221 +++++++++++++++++++++++++++++++++-------- index.html | 19 ++-- src/input.js | 6 +- src/main.js | 159 +++++++++++++++++++++++------ src/openers.js | 38 ++++++- src/shapes.js | 16 +++ 7 files changed, 374 insertions(+), 85 deletions(-) create mode 100644 dist/sound/Affirm2.ogg diff --git a/dist/sound/Affirm2.ogg b/dist/sound/Affirm2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d80a4248cbd1725ddff6bcdcffe28f2dafcc92f1 GIT binary patch literal 15193 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 G0RIaF6t@2W literal 0 HcmV?d00001 diff --git a/dist/tetrion.js b/dist/tetrion.js index c212baf..0daef75 100644 --- a/dist/tetrion.js +++ b/dist/tetrion.js @@ -660,7 +660,7 @@ var UserInputs = { gamepadQueue: [], keyboardKeySettings: ["Keyboard DAS", "Keyboard ARR"], - keyboardShiftEvents: ["Keyboard Left", "Keyboard Right", "Keyboard Down"], + keyboardShiftEvents: ["Keyboard Left", "Keyboard Right", "Keyboard Down", "Keyboard Up"], keyboardKeyEvents: ["Keyboard Harddrop", "Keyboard Hold", "Keyboard Rotateccw", "Keyboard Rotate", "Keyboard Pophold", "Keyboard Reset", "Keyboard Background"], gamepadSettings: ["Gamepad DAS", "Gamepad ARR"], @@ -670,8 +670,8 @@ var UserInputs = { settingsList: [], settingsDefault: [ "167.0", "33.0", - "37", "39", "40", - "32", "16", "90", "88,38", "17", "82", "81", + "37", "39", "40", "38", + "32", "16", "90", "88", "17", "82", "81", "167.0", "33.0", "DPad-Left", "DPad-Right", "DPad-Down", @@ -865,6 +865,7 @@ Tetris.prototype = { toggleGamepad: function(){ document.getElementById("enablegamepad").value = ((this.gamepadEnabled = !this.gamepadEnabled) ? "Disable Gamepad" : "Enable Gamepad"); }, + // Gamestate 1 setFreePlay: function() { @@ -882,6 +883,7 @@ Tetris.prototype = { this.currentOpener = 0; }, + // Gamestate 2 setCurrentOpener(opener) { document.getElementById("besttime").value = ""; @@ -891,6 +893,7 @@ Tetris.prototype = { this._restartHandler(); }, + // Gamestate 3 setDoTest: function() { @@ -898,8 +901,24 @@ Tetris.prototype = { // set game state to do test this.gameState = consts.GAMESTATES[2]; + this._restartHandler(); }, + // Gamestate 4 + setGameStateSequenceEditor: function() + { + document.getElementById("side").display = "none"; + + // change to editor gamestate + this.gameState = consts.GAMESTATES[3]; + this.hintQueue = []; + this.shapeQueue = []; + this.hintMino = 0; + this._restartHandler(); + this.currentOpener = 0; + this.pushHoldStack(); + }, + createSettings: function () { var list = document.getElementById("settings"); var settings = inputs.settingsList; @@ -926,6 +945,30 @@ Tetris.prototype = { inputs.settingsMap.get(inputs.settingsList[document.getElementById("settings").selectedIndex-1]); + }, + addOpener: function() { + + var newOpener = document.createElement('li'); + //
  • Mr. T-Spin's STD (reversed)
    • + //newOpener.text = "New Sequence"; + //newOpener.id = this.currentMinoInx; + newOpener.style="color:powderblue;text-decoration:underline;font-size:12px;padding-left:1em"; + + + newOpener.appendChild(document.createTextNode("New Sequence: " + this.currentMinoInx)); + document.getElementById("Openers").appendChild(newOpener); + + + openers.addSequence(this.shapeQueue); + //this.setFreePlay(); + this.gameState = consts.GAMESTATES[1]; + this.currentMinoInx = 0; + //this.setCurrentOpener(99999);//this.currentMinoInx); + clearMatrix(this.matrix); + this.currentOpener = 9999; + this.shapeQueue = []; + this.hintQueue = []; + this._recurseGameState(); }, setSettings: function() { var newVal = document.getElementById("setting_value").value; @@ -987,6 +1030,13 @@ Tetris.prototype = { }, pushHoldStack: function() { + if(this.gameState == consts.GAMESTATES[3]) { + while(this.holdStack.length < 7) + this.holdStack.unshift(utils.deepClone(shapes.getShape(this.currentMinoInx++%7))); + this.shape = this.holdStack.pop(); + this._draw(); + return; + } // 1 shape hold queue if(this.holdStack.length > 0) { this.canPopFromHoldStack = false; @@ -1012,6 +1062,19 @@ Tetris.prototype = { }, popHoldStack: function() { + if(this.gameState == consts.GAMESTATES[3]) { + if(this.holdStack.length < 7) + while(this.holdStack.length < 7) + this.holdStack.unshift(utils.deepClone(shapes.getShape(this.currentMinoInx++%7))); + // piece needs to be able to be placed + if(this.shape.canDown(this.matrix)) return; + this.shape.copyTo(this.matrix); + this.shapeQueue.unshift(utils.deepClone(this.shape)); + this.shape = this.holdStack.pop(); + this._check(); + this._draw(); + return; + } // todo: disable if 1 shape hold queue if(this.holdStack.length >= 1 && this.canPopFromHoldStack) { @@ -1067,7 +1130,7 @@ Tetris.prototype = { // Opener sequence completed if(this.currentMinoInx > openers.getLength()) { - new Audio("./dist/sound/Affirm.ogg").play(); + //new Audio("./dist/sound/Affirm2.ogg").play(); if(this.isTimerOn) { var besttime = document.getElementById("besttime").value; var deltaTime = new Date().getTime() - this.sequencePrevTime; @@ -1082,14 +1145,22 @@ Tetris.prototype = { this.shapeQueue = []; this.isSequenceCompleted = true; + // Recursion warning - this._restartHandler(); + if(this.currentOpener < 1000) // getting real hacky + this._restartHandler(); + else clearMatrix(this.matrix); // this.reset(); // this.start(); return; } }, - // Fill next queue and set next shape + // Process sequence editor + _processSequenceEditor: function () { + return; + }, + + // Fill next queue and set next shape _fireShape: function() { //todo:should be in shapes.js this.landed = false; @@ -1111,6 +1182,8 @@ Tetris.prototype = { case consts.GAMESTATES[2]: this._processOpenerTrainerQueue(); this._fireShape(); + case consts.GAMESTATES[3]: + this._processSequenceEditor(); break; default: @@ -1172,18 +1245,10 @@ Tetris.prototype = { if(this.gamepadEnabled && inputs.gamepadEnabled()) { - var tenthOfFrame = 1.0 //1.6; // 1.6ms = 1 fram - var halfFrame = 5.0 //8.0; - var halfFramePlus = 10.0; - - inputs.updateGamepad(); inputs.processGamepadDPad(); inputs.processGamepadInput(); - // drain gamepad queue - // if( inputs.getTickCounter() > halfFrame) // 8 millisecons - // { while((inputs.gamepadQueue != undefined && inputs.gamepadQueue.length >= 1)){ var curkey = inputs.gamepadQueue.shift(); if(inputs.settingsMap.get("Gamepad Left").includes(curkey)) { @@ -1211,9 +1276,15 @@ Tetris.prototype = { this._draw(); } else if(inputs.settingsMap.get("Gamepad Harddrop").includes(curkey)) { + // if editor + if(this.gameState == consts.GAMESTATES[3]) { + this.popHoldStack(); + this._draw(); + }else { this.shape.goBottom(this.matrix); this.lockDownTimer = 5000; this._update(); + } } else if(inputs.settingsMap.get("Gamepad Hold").includes(curkey)) { this.pushHoldStack(); @@ -1254,6 +1325,11 @@ Tetris.prototype = { this.shape.goDown(this.matrix); this._draw(); } + else if(this.gameState == consts.GAMESTATES[3] && inputs.settingsMap.get("Keyboard Up").includes(curkey)) { + + this.shape.goUp(this.matrix); + this._draw(); + } else if(inputs.settingsMap.get("Keyboard Rotateccw").includes(curkey)) { this.shape.rotate(this.matrix); this.resetLockdown(); @@ -1265,9 +1341,15 @@ Tetris.prototype = { this._draw(); } else if(inputs.settingsMap.get("Keyboard Harddrop").includes(curkey)) { - this.shape.goBottom(this.matrix); - this.lockDownTimer = 5000; - this._update(); + // if editor + if(this.gameState == consts.GAMESTATES[3]) { + this.popHoldStack(); + this._draw(); + }else { + this.shape.goBottom(this.matrix); + this.lockDownTimer = 5000; + this._update(); + } } else if(inputs.settingsMap.get("Keyboard Hold").includes(curkey)) { this.pushHoldStack(); @@ -1330,25 +1412,36 @@ Tetris.prototype = { // Update game data _update: function() { - if (this.shape.canDown(this.matrix)) { - this.shape.goDown(this.matrix); - } else if(this.isPieceLocked()){ - this.canPopFromHoldStack = true; - this.shape.copyTo(this.matrix); - this._check(); - if(this._checkHint()) return; - //this._fireShape(); - this._recurseGameState(); - new Audio('./dist/sound/Blop2.ogg').play(); - } - this._draw(); - this.isGameOver = checkGameOver(this.matrix); - - // if game over and gamestate is free play - views.setGameOver(this.gameState == consts.GAMESTATES[0] && this.isGameOver); - - if (this.isGameOver) - views.setFinalScore(this.score); + switch(this.gameState) { + case consts.GAMESTATES[0]: + case consts.GAMESTATES[1]: + case consts.GAMESTATES[2]: + if(this.shape == undefined) break; + if (this.shape.canDown(this.matrix)) { + this.shape.goDown(this.matrix); + } else if(this.isPieceLocked()){ + this.canPopFromHoldStack = true; + this.shape.copyTo(this.matrix); + this._check(); + if(this._checkHint()) return; + //this._fireShape(); + this._recurseGameState(); + new Audio('./dist/sound/Blop2.ogg').play(); + } + this._draw(); + this.isGameOver = checkGameOver(this.matrix); + + // if game over and gamestate is free play + views.setGameOver(this.gameState == consts.GAMESTATES[0] && this.isGameOver); + + if (this.isGameOver) + views.setFinalScore(this.score); + break; + case consts.GAMESTATES[3]: + break; + default: + break; + } }, // 0 - none, 1 - mini, 2 - tspin @@ -1434,6 +1527,7 @@ window.Tetris = Tetris; // export {Tetris}; },{"./canvas.js":1,"./consts.js":2,"./input.js":4,"./openers.js":6,"./shapes.js":7,"./utils.js":8,"./views.js":9}],6:[function(require,module,exports){ var shapes = require("./shapes.js"); +var utils = require("./utils.js"); // import * as shapes from './shapes.js'; // https://harddrop.com/wiki/Opener @@ -1606,6 +1700,7 @@ var openerGenerator = { shapes.getShape(3)); break; default: + this.shapeQueue.unshift(utils.deepClone(shapes.randomShape())); return; } } @@ -1620,7 +1715,9 @@ var openerGenerator = { this.idx++; if(this.idx == this.shapeQueue.length) { this.idx = 0; - this.isInit = 0; + if(opener < 1000) + this.isInit = 0; + else this.isInit = 1; } return mino; @@ -1876,6 +1973,7 @@ var openerGenerator = { } break; default: + this.hintQueue.unshift(utils.deepClone(shapes.randomShape())); return; } @@ -1893,7 +1991,9 @@ var openerGenerator = { this.hintIdx++; if(this.hintIdx == this.hintQueue.length) { this.hintIdx = 0; - this.isHintInit = 0; + if(opener < 1000) + this.isHintInit = 0; + else this.isHintInit = 1; } return mino; }, @@ -1908,6 +2008,27 @@ var openerGenerator = { }, getLength() { return this.hintQueue.length; + }, + addSequence(sequence) { + //this.reset(); + //this.shapeQueue = utils.deepClone(sequence); + //this.hintQueue = utils.deepClone(sequence); + for(var i in sequence) + { + var shape; + shape = sequence[i]; + shape.x = sequence[i].x; + shape.y = sequence[i].y; + shape.state = sequence[i].state; + this.hintQueue.unshift(utils.deepClone(shape)); + shape.x = shape.originX; + shape.y = shape.originY; + this.shapeQueue.unshift(utils.deepClone(shape)); + this.isInit = 1; + this.isHintInit = 1; + this.idx = 0; + this.hintIdx = 0; + } } }; @@ -1926,6 +2047,12 @@ function getNextHint(opener) { function getLength() { return openerGenerator.getLength(); } + +function addSequence(sequence) { + openerGenerator.addSequence(sequence); +} + +module.exports.addSequence = addSequence; module.exports.getNextMino = getNextMino; module.exports.getNextHint = getNextHint; module.exports.getLength = getLength; @@ -1937,7 +2064,7 @@ module.exports.reset = reset; -},{"./shapes.js":7}],7:[function(require,module,exports){ +},{"./shapes.js":7,"./utils.js":8}],7:[function(require,module,exports){ var consts = require('./consts.js'); var utils = require('./utils.js'); // import * as consts from './const.js'; @@ -2011,6 +2138,7 @@ function ShapeL() { this.states = [state1, state2, state3, state4]; this.x = 3; this.y = -3; + this.originX = 3; this.originY = -3; this.flag = 'L'; } @@ -2077,6 +2205,7 @@ function ShapeLR() { this.states = [state1, state2, state3, state4]; this.x = 3; this.y = -3; + this.originX = 3; this.originY = -3; this.flag = 'LR'; } @@ -2141,6 +2270,7 @@ function ShapeO() { this.states = [state1, state2, state3, state4]; this.x = 2; this.y = -2; + this.originX = 2; this.originY = -2; this.flag = 'O'; } @@ -2245,6 +2375,7 @@ function ShapeI() { this.x = 3; this.y = -4; + this.originX = 3; this.originY = -4; this.flag = 'I'; } @@ -2311,6 +2442,7 @@ function ShapeT() { this.x = 3; this.y = -2; + this.originX = 3; this.originY = -2; this.flag = 'T'; } @@ -2376,6 +2508,7 @@ function ShapeZ() { this.states = [state1, state2, state3, state4]; this.x = 3; this.y = -2; + this.originX = 3; this.originY = -2; this.flag = 'Z'; } @@ -2441,6 +2574,7 @@ function ShapeZR() { this.states = [state1, state2, state3, state4]; this.x = 3; this.y = -2 + this.originX = 3; this.originY = -2; this.flag = 'ZR'; } @@ -2545,6 +2679,9 @@ var isShapeCanMove = function(shape, matrix, action) { } else if (action === 'right') { x += 1; return x >= 0 && x < cols && matrix[y][x] == 0; + } else if (action === 'up') { + y -= 1; + return y >= 0 && matrix[y][x] == 0; } else if (action === 'down') { y += 1; return y < rows && matrix[y][x] == 0; @@ -2715,6 +2852,12 @@ ShapeZR.prototype = { this.y += 1; } }, + //Move the shape up + goUp: function(matrix) { + if (isShapeCanMove(this, matrix, 'up')) { + this.y -= 1; + } + }, //Move the shape to the Bottommost bottomAt: function(matrix) { var save = this.y; diff --git a/index.html b/index.html index 40c39cb..f790a33 100644 --- a/index.html +++ b/index.html @@ -47,10 +47,9 @@ - + @@ -163,9 +164,11 @@ document.getElementById("divbg").removeAttribute("tabIndex");
    - + + + + - @@ -195,8 +198,8 @@ document.getElementById("divbg").removeAttribute("tabIndex"); document.getElementById("test").addEventListener("click", function() { tetrion.setDoTest(); } ); document.getElementById("settings").addEventListener("change", function() { tetrion.updateSettingTextBox(); } ); document.getElementById("submitsetting").addEventListener("click", function() { tetrion.setSettings(); } ); - - + document.getElementById("sequenceeditor").addEventListener("click", function() { tetrion.setGameStateSequenceEditor(); } ); + document.getElementById("addopener").addEventListener("click", function() { tetrion.addOpener(); } ); tetrion.start(); })(); diff --git a/src/input.js b/src/input.js index 975ced0..1001217 100644 --- a/src/input.js +++ b/src/input.js @@ -227,7 +227,7 @@ var UserInputs = { gamepadQueue: [], keyboardKeySettings: ["Keyboard DAS", "Keyboard ARR"], - keyboardShiftEvents: ["Keyboard Left", "Keyboard Right", "Keyboard Down"], + keyboardShiftEvents: ["Keyboard Left", "Keyboard Right", "Keyboard Down", "Keyboard Up"], keyboardKeyEvents: ["Keyboard Harddrop", "Keyboard Hold", "Keyboard Rotateccw", "Keyboard Rotate", "Keyboard Pophold", "Keyboard Reset", "Keyboard Background"], gamepadSettings: ["Gamepad DAS", "Gamepad ARR"], @@ -237,8 +237,8 @@ var UserInputs = { settingsList: [], settingsDefault: [ "167.0", "33.0", - "37", "39", "40", - "32", "16", "90", "88,38", "17", "82", "81", + "37", "39", "40", "38", + "32", "16", "90", "88", "17", "82", "81", "167.0", "33.0", "DPad-Left", "DPad-Right", "DPad-Down", diff --git a/src/main.js b/src/main.js index e49e7e0..79a0856 100644 --- a/src/main.js +++ b/src/main.js @@ -181,6 +181,7 @@ Tetris.prototype = { toggleGamepad: function(){ document.getElementById("enablegamepad").value = ((this.gamepadEnabled = !this.gamepadEnabled) ? "Disable Gamepad" : "Enable Gamepad"); }, + // Gamestate 1 setFreePlay: function() { @@ -198,6 +199,7 @@ Tetris.prototype = { this.currentOpener = 0; }, + // Gamestate 2 setCurrentOpener(opener) { document.getElementById("besttime").value = ""; @@ -207,6 +209,7 @@ Tetris.prototype = { this._restartHandler(); }, + // Gamestate 3 setDoTest: function() { @@ -214,8 +217,24 @@ Tetris.prototype = { // set game state to do test this.gameState = consts.GAMESTATES[2]; + this._restartHandler(); }, + // Gamestate 4 + setGameStateSequenceEditor: function() + { + document.getElementById("side").display = "none"; + + // change to editor gamestate + this.gameState = consts.GAMESTATES[3]; + this.hintQueue = []; + this.shapeQueue = []; + this.hintMino = 0; + this._restartHandler(); + this.currentOpener = 0; + this.pushHoldStack(); + }, + createSettings: function () { var list = document.getElementById("settings"); var settings = inputs.settingsList; @@ -242,6 +261,30 @@ Tetris.prototype = { inputs.settingsMap.get(inputs.settingsList[document.getElementById("settings").selectedIndex-1]); + }, + addOpener: function() { + + var newOpener = document.createElement('li'); + //
  • Mr. T-Spin's STD (reversed)
    • + //newOpener.text = "New Sequence"; + //newOpener.id = this.currentMinoInx; + newOpener.style="color:powderblue;text-decoration:underline;font-size:12px;padding-left:1em"; + + + newOpener.appendChild(document.createTextNode("New Sequence: " + this.currentMinoInx)); + document.getElementById("Openers").appendChild(newOpener); + + + openers.addSequence(this.shapeQueue); + //this.setFreePlay(); + this.gameState = consts.GAMESTATES[1]; + this.currentMinoInx = 0; + //this.setCurrentOpener(99999);//this.currentMinoInx); + clearMatrix(this.matrix); + this.currentOpener = 9999; + this.shapeQueue = []; + this.hintQueue = []; + this._recurseGameState(); }, setSettings: function() { var newVal = document.getElementById("setting_value").value; @@ -303,6 +346,13 @@ Tetris.prototype = { }, pushHoldStack: function() { + if(this.gameState == consts.GAMESTATES[3]) { + while(this.holdStack.length < 7) + this.holdStack.unshift(utils.deepClone(shapes.getShape(this.currentMinoInx++%7))); + this.shape = this.holdStack.pop(); + this._draw(); + return; + } // 1 shape hold queue if(this.holdStack.length > 0) { this.canPopFromHoldStack = false; @@ -328,6 +378,19 @@ Tetris.prototype = { }, popHoldStack: function() { + if(this.gameState == consts.GAMESTATES[3]) { + if(this.holdStack.length < 7) + while(this.holdStack.length < 7) + this.holdStack.unshift(utils.deepClone(shapes.getShape(this.currentMinoInx++%7))); + // piece needs to be able to be placed + if(this.shape.canDown(this.matrix)) return; + this.shape.copyTo(this.matrix); + this.shapeQueue.unshift(utils.deepClone(this.shape)); + this.shape = this.holdStack.pop(); + this._check(); + this._draw(); + return; + } // todo: disable if 1 shape hold queue if(this.holdStack.length >= 1 && this.canPopFromHoldStack) { @@ -383,7 +446,7 @@ Tetris.prototype = { // Opener sequence completed if(this.currentMinoInx > openers.getLength()) { - new Audio("./dist/sound/Affirm.ogg").play(); + //new Audio("./dist/sound/Affirm2.ogg").play(); if(this.isTimerOn) { var besttime = document.getElementById("besttime").value; var deltaTime = new Date().getTime() - this.sequencePrevTime; @@ -398,14 +461,22 @@ Tetris.prototype = { this.shapeQueue = []; this.isSequenceCompleted = true; + // Recursion warning - this._restartHandler(); + if(this.currentOpener < 1000) // getting real hacky + this._restartHandler(); + else clearMatrix(this.matrix); // this.reset(); // this.start(); return; } }, - // Fill next queue and set next shape + // Process sequence editor + _processSequenceEditor: function () { + return; + }, + + // Fill next queue and set next shape _fireShape: function() { //todo:should be in shapes.js this.landed = false; @@ -427,6 +498,8 @@ Tetris.prototype = { case consts.GAMESTATES[2]: this._processOpenerTrainerQueue(); this._fireShape(); + case consts.GAMESTATES[3]: + this._processSequenceEditor(); break; default: @@ -488,18 +561,10 @@ Tetris.prototype = { if(this.gamepadEnabled && inputs.gamepadEnabled()) { - var tenthOfFrame = 1.0 //1.6; // 1.6ms = 1 fram - var halfFrame = 5.0 //8.0; - var halfFramePlus = 10.0; - - inputs.updateGamepad(); inputs.processGamepadDPad(); inputs.processGamepadInput(); - // drain gamepad queue - // if( inputs.getTickCounter() > halfFrame) // 8 millisecons - // { while((inputs.gamepadQueue != undefined && inputs.gamepadQueue.length >= 1)){ var curkey = inputs.gamepadQueue.shift(); if(inputs.settingsMap.get("Gamepad Left").includes(curkey)) { @@ -527,9 +592,15 @@ Tetris.prototype = { this._draw(); } else if(inputs.settingsMap.get("Gamepad Harddrop").includes(curkey)) { + // if editor + if(this.gameState == consts.GAMESTATES[3]) { + this.popHoldStack(); + this._draw(); + }else { this.shape.goBottom(this.matrix); this.lockDownTimer = 5000; this._update(); + } } else if(inputs.settingsMap.get("Gamepad Hold").includes(curkey)) { this.pushHoldStack(); @@ -570,6 +641,11 @@ Tetris.prototype = { this.shape.goDown(this.matrix); this._draw(); } + else if(this.gameState == consts.GAMESTATES[3] && inputs.settingsMap.get("Keyboard Up").includes(curkey)) { + + this.shape.goUp(this.matrix); + this._draw(); + } else if(inputs.settingsMap.get("Keyboard Rotateccw").includes(curkey)) { this.shape.rotate(this.matrix); this.resetLockdown(); @@ -581,9 +657,15 @@ Tetris.prototype = { this._draw(); } else if(inputs.settingsMap.get("Keyboard Harddrop").includes(curkey)) { - this.shape.goBottom(this.matrix); - this.lockDownTimer = 5000; - this._update(); + // if editor + if(this.gameState == consts.GAMESTATES[3]) { + this.popHoldStack(); + this._draw(); + }else { + this.shape.goBottom(this.matrix); + this.lockDownTimer = 5000; + this._update(); + } } else if(inputs.settingsMap.get("Keyboard Hold").includes(curkey)) { this.pushHoldStack(); @@ -646,25 +728,36 @@ Tetris.prototype = { // Update game data _update: function() { - if (this.shape.canDown(this.matrix)) { - this.shape.goDown(this.matrix); - } else if(this.isPieceLocked()){ - this.canPopFromHoldStack = true; - this.shape.copyTo(this.matrix); - this._check(); - if(this._checkHint()) return; - //this._fireShape(); - this._recurseGameState(); - new Audio('./dist/sound/Blop2.ogg').play(); - } - this._draw(); - this.isGameOver = checkGameOver(this.matrix); - - // if game over and gamestate is free play - views.setGameOver(this.gameState == consts.GAMESTATES[0] && this.isGameOver); - - if (this.isGameOver) - views.setFinalScore(this.score); + switch(this.gameState) { + case consts.GAMESTATES[0]: + case consts.GAMESTATES[1]: + case consts.GAMESTATES[2]: + if(this.shape == undefined) break; + if (this.shape.canDown(this.matrix)) { + this.shape.goDown(this.matrix); + } else if(this.isPieceLocked()){ + this.canPopFromHoldStack = true; + this.shape.copyTo(this.matrix); + this._check(); + if(this._checkHint()) return; + //this._fireShape(); + this._recurseGameState(); + new Audio('./dist/sound/Blop2.ogg').play(); + } + this._draw(); + this.isGameOver = checkGameOver(this.matrix); + + // if game over and gamestate is free play + views.setGameOver(this.gameState == consts.GAMESTATES[0] && this.isGameOver); + + if (this.isGameOver) + views.setFinalScore(this.score); + break; + case consts.GAMESTATES[3]: + break; + default: + break; + } }, // 0 - none, 1 - mini, 2 - tspin diff --git a/src/openers.js b/src/openers.js index 0d58393..d619435 100644 --- a/src/openers.js +++ b/src/openers.js @@ -1,4 +1,5 @@ var shapes = require("./shapes.js"); +var utils = require("./utils.js"); // import * as shapes from './shapes.js'; // https://harddrop.com/wiki/Opener @@ -171,6 +172,7 @@ var openerGenerator = { shapes.getShape(3)); break; default: + this.shapeQueue.unshift(utils.deepClone(shapes.randomShape())); return; } } @@ -185,7 +187,9 @@ var openerGenerator = { this.idx++; if(this.idx == this.shapeQueue.length) { this.idx = 0; - this.isInit = 0; + if(opener < 1000) + this.isInit = 0; + else this.isInit = 1; } return mino; @@ -441,6 +445,7 @@ var openerGenerator = { } break; default: + this.hintQueue.unshift(utils.deepClone(shapes.randomShape())); return; } @@ -458,7 +463,9 @@ var openerGenerator = { this.hintIdx++; if(this.hintIdx == this.hintQueue.length) { this.hintIdx = 0; - this.isHintInit = 0; + if(opener < 1000) + this.isHintInit = 0; + else this.isHintInit = 1; } return mino; }, @@ -473,6 +480,27 @@ var openerGenerator = { }, getLength() { return this.hintQueue.length; + }, + addSequence(sequence) { + //this.reset(); + //this.shapeQueue = utils.deepClone(sequence); + //this.hintQueue = utils.deepClone(sequence); + for(var i in sequence) + { + var shape; + shape = sequence[i]; + shape.x = sequence[i].x; + shape.y = sequence[i].y; + shape.state = sequence[i].state; + this.hintQueue.unshift(utils.deepClone(shape)); + shape.x = shape.originX; + shape.y = shape.originY; + this.shapeQueue.unshift(utils.deepClone(shape)); + this.isInit = 1; + this.isHintInit = 1; + this.idx = 0; + this.hintIdx = 0; + } } }; @@ -491,6 +519,12 @@ function getNextHint(opener) { function getLength() { return openerGenerator.getLength(); } + +function addSequence(sequence) { + openerGenerator.addSequence(sequence); +} + +module.exports.addSequence = addSequence; module.exports.getNextMino = getNextMino; module.exports.getNextHint = getNextHint; module.exports.getLength = getLength; diff --git a/src/shapes.js b/src/shapes.js index 43379f6..7bbc33d 100644 --- a/src/shapes.js +++ b/src/shapes.js @@ -71,6 +71,7 @@ function ShapeL() { this.states = [state1, state2, state3, state4]; this.x = 3; this.y = -3; + this.originX = 3; this.originY = -3; this.flag = 'L'; } @@ -137,6 +138,7 @@ function ShapeLR() { this.states = [state1, state2, state3, state4]; this.x = 3; this.y = -3; + this.originX = 3; this.originY = -3; this.flag = 'LR'; } @@ -201,6 +203,7 @@ function ShapeO() { this.states = [state1, state2, state3, state4]; this.x = 2; this.y = -2; + this.originX = 2; this.originY = -2; this.flag = 'O'; } @@ -305,6 +308,7 @@ function ShapeI() { this.x = 3; this.y = -4; + this.originX = 3; this.originY = -4; this.flag = 'I'; } @@ -371,6 +375,7 @@ function ShapeT() { this.x = 3; this.y = -2; + this.originX = 3; this.originY = -2; this.flag = 'T'; } @@ -436,6 +441,7 @@ function ShapeZ() { this.states = [state1, state2, state3, state4]; this.x = 3; this.y = -2; + this.originX = 3; this.originY = -2; this.flag = 'Z'; } @@ -501,6 +507,7 @@ function ShapeZR() { this.states = [state1, state2, state3, state4]; this.x = 3; this.y = -2 + this.originX = 3; this.originY = -2; this.flag = 'ZR'; } @@ -605,6 +612,9 @@ var isShapeCanMove = function(shape, matrix, action) { } else if (action === 'right') { x += 1; return x >= 0 && x < cols && matrix[y][x] == 0; + } else if (action === 'up') { + y -= 1; + return y >= 0 && matrix[y][x] == 0; } else if (action === 'down') { y += 1; return y < rows && matrix[y][x] == 0; @@ -775,6 +785,12 @@ ShapeZR.prototype = { this.y += 1; } }, + //Move the shape up + goUp: function(matrix) { + if (isShapeCanMove(this, matrix, 'up')) { + this.y -= 1; + } + }, //Move the shape to the Bottommost bottomAt: function(matrix) { var save = this.y;