wbrawner/hextris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed comboTime to 4

Browse source
This commit is contained in:
Garrett Finucane 2014-07-27 20:05:12 -04:00
commit 94e71a3b21
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
js/checking.js
View file

@ -69,7 +69,6 @@ function consolidateBlocks(hex,side,index){
// add scores
var now = MainHex.ct;
if(now - hex.lastCombo < settings.comboTime ){
//settings.comboTime = settings.creationSpeedModifier * 4;
settings.comboTime = (1/settings.creationSpeedModifier) * (waveone.nextGen/16.666667) * 2;
hex.comboMultiplier += 1;
hex.lastCombo = now;

5
js/main.js
View file

@ -14,7 +14,6 @@ function scaleCanvas() {
};
if (window.devicePixelRatio) {
//from https://gist.github.com/joubertnel/870190
var cw = $("#canvas").attr('width');
var ch = $("#canvas").attr('height');
@ -195,7 +194,7 @@ function setStartScreen() {
$('#restartBtn').show();
$('#startBtn').show();
$('#attributions').show();
showbottombar()
showbottombar();
gameState = 0;
requestAnimFrame(animLoop);
@ -262,7 +261,7 @@ function animLoop() {
break;
case 4:
setTimeout(function(){initialize(1)}, 1);
setTimeout(function(){initialize(1);}, 1);
render();
return;

26
js/wavegen.js
View file

@ -1,8 +1,8 @@
function blockDestroyed() {
if (waveone.nextGen > 1000) {
waveone.nextGen -= 7 * settings.creationSpeedModifier;
if (waveone.nextGen > 750) {
waveone.nextGen -= 25 * settings.creationSpeedModifier;
} else {
waveone.nextGen = 1000;
waveone.nextGen = 750;
}
if (waveone.difficulty < 15) {
@ -15,7 +15,7 @@ function blockDestroyed() {
function waveGen(hex) {
this.lastGen = 0;
this.last = 0;
this.nextGen = 2800;
this.nextGen = 2300;
this.start = 0;
this.colors = colors;
this.ct = 0;
@ -27,8 +27,8 @@ function waveGen(hex) {
this.dt += 16.6666667;
this.computeDifficulty();
if ((this.dt - this.lastGen)*settings.creationSpeedModifier > this.nextGen) {
if (this.nextGen > 1000) {
this.nextGen -= 5 * ((this.nextGen/1300)) * settings.creationSpeedModifier;
if (this.nextGen > 750) {
this.nextGen -= 10 * ((this.nextGen/1300)) * settings.creationSpeedModifier;
}
}
};
@ -42,19 +42,19 @@ function waveGen(hex) {
var lim = randInt(1, 7);
if (this.ct > lim) {
var nextPattern = randInt(0, 3 + 21);
if (nextPattern > 3 + 17) {
if (nextPattern > 15) {
this.ct = 0;
this.currentFunction = this.doubleGeneration;
} else if (nextPattern > 3 + 14) {
} else if (nextPattern > 10) {
this.ct = 0;
this.currentFunction = this.crosswiseGeneration;
} else if (nextPattern > 3 + 11) {
} else if (nextPattern > 7) {
this.ct = 0;
this.currentFunction = this.spiralGeneration;
} else if (nextPattern > 3 + 8) {
} else if (nextPattern > 4) {
this.ct = 0;
this.currentFunction = this.circleGeneration;
} else if (nextPattern > 3 + 5) {
} else if (nextPattern > 1) {
this.ct = 0;
this.currentFunction = this.halfCircleGeneration;
}
@ -117,7 +117,7 @@ function waveGen(hex) {
addNewBlock((d+i) % 6, colorList[i], 1.5 + (this.difficulty/15) * 3);
}
this.ct += 5;
this.ct += 8;
this.lastGen = this.dt;
this.shouldChangePattern();
}
@ -137,7 +137,7 @@ function waveGen(hex) {
this.spiralGeneration = function() {
var dir = randInt(0, 2);
if (this.dt - this.lastGen > this.nextGen * (5/9)) {
if (this.dt - this.lastGen > this.nextGen * (2/3)) {
if (dir) {
addNewBlock(5 - (this.ct % MainHex.sides), colors[randInt(0, colors.length)], 1.5 + (this.difficulty/15) * (3/2));
}