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

fixed merge conflicts

Browse source
This commit is contained in:
meadowstream 2014-07-27 20:01:41 -04:00
commit b8460c0740
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/checking.js
View file

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