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

Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages

Browse source
This commit is contained in:
meadowstream 2014-05-26 13:30:43 -04:00
commit cccdb45f55
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/Text.js
View file

@ -5,9 +5,10 @@ function Text(x,y,text,font,color,incrementFunction){
this.color = color; this.color = color;
this.opacity =1; this.opacity =1;
this.text = text; this.text = text;
this.alive=1;
this.draw = function(){ this.draw = function(){
if(this.opacity>0){ if(this.alive>0){
ctx.font= this.font; ctx.font= this.font;
ctx.fillStyle = this.color; ctx.fillStyle = this.color;
ctx.globalAlpha = this.opacity; ctx.globalAlpha = this.opacity;
@ -28,9 +29,10 @@ function Text(x,y,text,font,color,incrementFunction){
function fadeUpAndOut(text){ function fadeUpAndOut(text){
text.opacity -=0.07; text.opacity -=0.07;
text.alive = text.opacity;
text.y-=3; text.y-=3;
} }
function fadeOut(text){ function fadeOut(text){
text.opacity -= 0.02; text.alive -= 0.02;
} }

2
js/checking.js
View file

@ -70,7 +70,7 @@ function consolidateBlocks(clock,side,index){
clock.comboMultiplier += 1; clock.comboMultiplier += 1;
clock.lastCombo = now; clock.lastCombo = now;
var coords = findCenterOfBlocks(deletedBlocks); var coords = findCenterOfBlocks(deletedBlocks);
clock.texts.push(new Text(coords['x'],coords['y'],"x "+clock.comboMultiplier.toString(),"bold Lovelo 24px",deletedBlocks[0].color,fadeOut)); clock.texts.push(new Text(coords['x'],coords['y'],"x "+clock.comboMultiplier.toString(),"bold Lovelo 24px","#fff",fadeOut));
} }
else{ else{
clock.lastCombo = now; clock.lastCombo = now;