PolicyChanges
/
policychanges
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix reset

pull/1/head
PolicyChanges1@gmail.com 2021-02-18 03:51:08 -05:00
parent 9d70948f74
commit 9047890060
5 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -3,7 +3,7 @@
# MIT Liecense # MIT Liecense
[Tetrion](http://policychanges.github.io) #[Tetrion](http://policychanges.github.io)
# Tetris # Tetris
@ -14,7 +14,7 @@ Just a practice, if you are interested in writing html5 games,check the code an
# Demo # Demo
# [Tetris Game](http://sandywalker.github.io/Tetris/) [Tetris Game](http://sandywalker.github.io/Tetris/)
# License # License

33
dist/tetrion.js vendored
View File

@ -500,7 +500,7 @@ var UserInputs = {
var ARR = 20.0; var ARR = 20.0;
var isContained = this.gpButtons.includes(finds); var isContained = this.gpButtons.includes(finds);
var isPrevContained = this.prevGpButtons.includes(finds); var isPrevContained = this.prevGpButtons.includes(finds);
//console.log("but: " + this.gpButtons + " prev but:" + this.prevGpButtons);
if(isPrevContained != isContained ) { if(isPrevContained != isContained ) {
this.isGamepadDown = false; this.isGamepadDown = false;
// Do once // Do once
@ -512,7 +512,7 @@ var UserInputs = {
if (gamepadDirectionDasFrames >= DAS) { if (gamepadDirectionDasFrames >= DAS) {
this.gamepadDirectionPadDeciFrames = 0; this.gamepadDirectionPadDeciFrames = 0;
this.isGamepadDown = true; this.isGamepadDown = true;
//console.log(this.isGamepadDown + " " + this.gam);
} }
} }
else else
@ -586,9 +586,9 @@ var UserInputs = {
this.inputqueue.push(key); this.inputqueue.push(key);
} }
//console.log(key + " " + this.held
var keyboardDASFrames = this.keyboardDirectionArrowsDeciframes / 1.0; // why isnt this 10? var keyboardDASFrames = this.keyboardDirectionArrowsDeciframes / 1.0; // why isnt this 10?
//console.log(keyboardDASFrames + " " + this.held);
if (!this.isDirectionArrowDown) { if (!this.isDirectionArrowDown) {
if (keyboardDASFrames >= DAS) { if (keyboardDASFrames >= DAS) {
@ -833,7 +833,8 @@ Tetris.prototype = {
views.setLevel(this.level); views.setLevel(this.level);
views.setScore(this.score); views.setScore(this.score);
views.setGameOver(this.isGameOver); views.setGameOver(this.isGameOver);
openers.reset();
this._draw(); this._draw();
}, },
//Start game //Start game
@ -950,7 +951,6 @@ Tetris.prototype = {
// TODO: put in web worker--limited to 60fps here // TODO: put in web worker--limited to 60fps here
if(deltaTime >= tenthOfFrame) { // needs to be 600hz // 16 / 10 if(deltaTime >= tenthOfFrame) { // needs to be 600hz // 16 / 10
inputs.incDeciframes(); inputs.incDeciframes();
//console.log(deltaTime / 600.0);
} }
if(deltaTime >= tenthOfFrame) { if(deltaTime >= tenthOfFrame) {
@ -1133,6 +1133,11 @@ Tetris.prototype = {
}, },
_checkHint: function() {
if(this.shape.y != this.hintMino.y || this.shape.x != this.hintMino.x)
//1console.log("success!");
this._restartHandler();
},
// Update game data // Update game data
_update: function() { _update: function() {
@ -1142,6 +1147,7 @@ Tetris.prototype = {
this.canPullFromHoldQueue = true; this.canPullFromHoldQueue = true;
this.shape.copyTo(this.matrix); this.shape.copyTo(this.matrix);
this._check(); this._check();
this._checkHint();
this._fireShape(); this._fireShape();
new Audio('./dist/Blop2.ogg').play(); new Audio('./dist/Blop2.ogg').play();
} }
@ -1255,7 +1261,7 @@ var OpenerGenerator = {
} }
this.isInit = 1; this.isInit = 1;
return;// this.shapeQueue; return;
}, },
getNextMino() { getNextMino() {
@ -1266,10 +1272,8 @@ var OpenerGenerator = {
this.idx = 0; this.idx = 0;
this.isInit = 0; this.isInit = 0;
} }
console.log("mino: " + mino);
return mino; return mino;
//return this.shapeQueue[this.idx%=6];
}, },
// L O Z T LR ZR I // L O Z T LR ZR I
initHint(matrix) { initHint(matrix) {
@ -1283,7 +1287,6 @@ var OpenerGenerator = {
shapes.getShape(4), shapes.getShape(4),
shapes.getShape(3)); shapes.getShape(3));
//console.log("matrix: " + matrix);
// L // L
this.hintQueue[0].x = 0; this.hintQueue[0].x = 0;
this.hintQueue[0].y = 17; this.hintQueue[0].y = 17;
@ -1291,7 +1294,6 @@ var OpenerGenerator = {
this.hintQueue[1].x = 3; this.hintQueue[1].x = 3;
this.hintQueue[1].y = 19; this.hintQueue[1].y = 19;
this.hintQueue[1].state = this.hintQueue[1].nextState(1); this.hintQueue[1].state = this.hintQueue[1].nextState(1);
//this.hintQueue[1].matrix =
// O // O
this.hintQueue[2].x = 8; this.hintQueue[2].x = 8;
this.hintQueue[2].y = 18; this.hintQueue[2].y = 18;
@ -1316,26 +1318,25 @@ var OpenerGenerator = {
this.isHintInit = 1; this.isHintInit = 1;
return;// this.shapeQueue; return;
}, },
getNextHint(matrix) { getNextHint(matrix) {
this.initHint(matrix); this.initHint(matrix);
console.log("hint " + this.hintIdx);
var mino = this.hintQueue[this.hintIdx]; var mino = this.hintQueue[this.hintIdx];
this.hintIdx++; this.hintIdx++;
if(this.hintIdx == 7) { if(this.hintIdx == 7) {
this.hintIdx = 0; this.hintIdx = 0;
this.isHintInit = 0; this.isHintInit = 0;
} }
console.log("hintmino: " + mino)
return mino; return mino;
//return this.shapeQueue[this.idx%=6];
}, },
reset() { reset() {
this.shapeQueue = []; this.shapeQueue = [];
this.hintQueue = []; this.hintQueue = [];
this.idx = 0; this.idx = 0;
this.hintIdx = 0; this.hintIdx = 0;
this.isInit = 0;
this.isHintInit = 0;
} }
}; };
@ -1345,12 +1346,10 @@ function reset() {
function getNextMino() { function getNextMino() {
var mino = OpenerGenerator.getNextMino(); var mino = OpenerGenerator.getNextMino();
//console.log("Mino: " + mino);
return mino; return mino;
} }
function getNextHint(matrix) { function getNextHint(matrix) {
var mino = OpenerGenerator.getNextHint(matrix); var mino = OpenerGenerator.getNextHint(matrix);
//console.log("Mino: " + mino);
return mino; return mino;
} }
module.exports.getNextMino = getNextMino; module.exports.getNextMino = getNextMino;

8
src/input.js
View File

@ -80,7 +80,7 @@ var UserInputs = {
var ARR = 20.0; var ARR = 20.0;
var isContained = this.gpButtons.includes(finds); var isContained = this.gpButtons.includes(finds);
var isPrevContained = this.prevGpButtons.includes(finds); var isPrevContained = this.prevGpButtons.includes(finds);
//console.log("but: " + this.gpButtons + " prev but:" + this.prevGpButtons);
if(isPrevContained != isContained ) { if(isPrevContained != isContained ) {
this.isGamepadDown = false; this.isGamepadDown = false;
// Do once // Do once
@ -92,7 +92,7 @@ var UserInputs = {
if (gamepadDirectionDasFrames >= DAS) { if (gamepadDirectionDasFrames >= DAS) {
this.gamepadDirectionPadDeciFrames = 0; this.gamepadDirectionPadDeciFrames = 0;
this.isGamepadDown = true; this.isGamepadDown = true;
//console.log(this.isGamepadDown + " " + this.gam);
} }
} }
else else
@ -166,9 +166,9 @@ var UserInputs = {
this.inputqueue.push(key); this.inputqueue.push(key);
} }
//console.log(key + " " + this.held
var keyboardDASFrames = this.keyboardDirectionArrowsDeciframes / 1.0; // why isnt this 10? var keyboardDASFrames = this.keyboardDirectionArrowsDeciframes / 1.0; // why isnt this 10?
//console.log(keyboardDASFrames + " " + this.held);
if (!this.isDirectionArrowDown) { if (!this.isDirectionArrowDown) {
if (keyboardDASFrames >= DAS) { if (keyboardDASFrames >= DAS) {

10
src/main.js
View File

@ -182,7 +182,8 @@ Tetris.prototype = {
views.setLevel(this.level); views.setLevel(this.level);
views.setScore(this.score); views.setScore(this.score);
views.setGameOver(this.isGameOver); views.setGameOver(this.isGameOver);
openers.reset();
this._draw(); this._draw();
}, },
//Start game //Start game
@ -299,7 +300,6 @@ Tetris.prototype = {
// TODO: put in web worker--limited to 60fps here // TODO: put in web worker--limited to 60fps here
if(deltaTime >= tenthOfFrame) { // needs to be 600hz // 16 / 10 if(deltaTime >= tenthOfFrame) { // needs to be 600hz // 16 / 10
inputs.incDeciframes(); inputs.incDeciframes();
//console.log(deltaTime / 600.0);
} }
if(deltaTime >= tenthOfFrame) { if(deltaTime >= tenthOfFrame) {
@ -482,6 +482,11 @@ Tetris.prototype = {
}, },
_checkHint: function() {
if(this.shape.y != this.hintMino.y || this.shape.x != this.hintMino.x)
//1console.log("success!");
this._restartHandler();
},
// Update game data // Update game data
_update: function() { _update: function() {
@ -491,6 +496,7 @@ Tetris.prototype = {
this.canPullFromHoldQueue = true; this.canPullFromHoldQueue = true;
this.shape.copyTo(this.matrix); this.shape.copyTo(this.matrix);
this._check(); this._check();
this._checkHint();
this._fireShape(); this._fireShape();
new Audio('./dist/Blop2.ogg').play(); new Audio('./dist/Blop2.ogg').play();
} }

15
src/openers.js
View File

@ -65,7 +65,7 @@ var OpenerGenerator = {
} }
this.isInit = 1; this.isInit = 1;
return;// this.shapeQueue; return;
}, },
getNextMino() { getNextMino() {
@ -76,10 +76,8 @@ var OpenerGenerator = {
this.idx = 0; this.idx = 0;
this.isInit = 0; this.isInit = 0;
} }
console.log("mino: " + mino);
return mino; return mino;
//return this.shapeQueue[this.idx%=6];
}, },
// L O Z T LR ZR I // L O Z T LR ZR I
initHint(matrix) { initHint(matrix) {
@ -93,7 +91,6 @@ var OpenerGenerator = {
shapes.getShape(4), shapes.getShape(4),
shapes.getShape(3)); shapes.getShape(3));
//console.log("matrix: " + matrix);
// L // L
this.hintQueue[0].x = 0; this.hintQueue[0].x = 0;
this.hintQueue[0].y = 17; this.hintQueue[0].y = 17;
@ -101,7 +98,6 @@ var OpenerGenerator = {
this.hintQueue[1].x = 3; this.hintQueue[1].x = 3;
this.hintQueue[1].y = 19; this.hintQueue[1].y = 19;
this.hintQueue[1].state = this.hintQueue[1].nextState(1); this.hintQueue[1].state = this.hintQueue[1].nextState(1);
//this.hintQueue[1].matrix =
// O // O
this.hintQueue[2].x = 8; this.hintQueue[2].x = 8;
this.hintQueue[2].y = 18; this.hintQueue[2].y = 18;
@ -126,26 +122,25 @@ var OpenerGenerator = {
this.isHintInit = 1; this.isHintInit = 1;
return;// this.shapeQueue; return;
}, },
getNextHint(matrix) { getNextHint(matrix) {
this.initHint(matrix); this.initHint(matrix);
console.log("hint " + this.hintIdx);
var mino = this.hintQueue[this.hintIdx]; var mino = this.hintQueue[this.hintIdx];
this.hintIdx++; this.hintIdx++;
if(this.hintIdx == 7) { if(this.hintIdx == 7) {
this.hintIdx = 0; this.hintIdx = 0;
this.isHintInit = 0; this.isHintInit = 0;
} }
console.log("hintmino: " + mino)
return mino; return mino;
//return this.shapeQueue[this.idx%=6];
}, },
reset() { reset() {
this.shapeQueue = []; this.shapeQueue = [];
this.hintQueue = []; this.hintQueue = [];
this.idx = 0; this.idx = 0;
this.hintIdx = 0; this.hintIdx = 0;
this.isInit = 0;
this.isHintInit = 0;
} }
}; };
@ -155,12 +150,10 @@ function reset() {
function getNextMino() { function getNextMino() {
var mino = OpenerGenerator.getNextMino(); var mino = OpenerGenerator.getNextMino();
//console.log("Mino: " + mino);
return mino; return mino;
} }
function getNextHint(matrix) { function getNextHint(matrix) {
var mino = OpenerGenerator.getNextHint(matrix); var mino = OpenerGenerator.getNextHint(matrix);
//console.log("Mino: " + mino);
return mino; return mino;
} }
module.exports.getNextMino = getNextMino; module.exports.getNextMino = getNextMino;