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

Merge branch 'master' of http://github.com/teamsnowman/hextris

Browse source
This commit is contained in:
garrettdreyfus 2014-05-24 14:12:44 -04:00
commit ece80f89b8
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
js/main.js
View file

@ -80,7 +80,8 @@ function addNewBlock(blocklane, color, iter, distFromHex, settled) { //last two
history[count].block = {
blocklane:blocklane,
color:color
color:color,
iter:iter
};
if (distFromHex) {
@ -95,10 +96,11 @@ function addNewBlock(blocklane, color, iter, distFromHex, settled) { //last two
function importHistory() {
try {
importedHistory = JSON.parse(prompt("Import JSON"));
if (importedHistory) {
importing = 1;
var ih = JSON.parse(prompt("Import JSON"));
if (ih) {
init();
importing = 1;
importedHistory = ih;
}
}
catch (e) {
@ -113,18 +115,6 @@ function exportHistory() {
//remember to update history function to show the respective iter speeds
function update() {
if (importing) {
if (importedHistory[count]) {
if (importedHistory[count].block) {
addNewBlock(importedHistory[count].block.blocklane, 1, importedHistory[count].block.color,importedHistory[count].block.distFromHex, importedHistory[count].block.settled);
}
if (importedHistory[count].rotate) {
MainClock.rotate(importedHistory[count].rotate);
}
}
}
var now = Date.now();
if (now - prevTimeScored > 1000) {
@ -132,7 +122,19 @@ function update() {
prevTimeScored = now;
}
if (!importing) {
if (importing) {
if (importedHistory[count]) {
if (importedHistory[count].block) {
addNewBlock(importedHistory[count].block.blocklane, importedHistory[count].block.color, importedHistory[count].block.iter, importedHistory[count].block.distFromHex, importedHistory[count].block.settled);
}
if (importedHistory[count].rotate) {
MainClock.rotate(importedHistory[count].rotate);
}
}
}
else {
waveone.update();
if (now - waveone.prevTimeScored > 1000) {
score += 5 * (scoreScalar * scoreAdditionCoeff);

1
js/wavegen.js
View file

@ -87,6 +87,7 @@ function waveGen(clock) {
for (var i = 0; i < MainClock.sides; i++) {
addNewBlock(i, colorList[i % numColors], 1.2 + (this.integerDifficulty/15) * 3);
}
this.ct += 15;
this.lastGen = this.dt;
//this.shouldGoBackToRandom();