From 7958afc0f06f1c8190a68393ae3c819f5911d445 Mon Sep 17 00:00:00 2001
From: LoveEevee <LoveEevee@users.noreply.github.com>
Date: Thu, 20 Sep 2018 20:04:22 +0300
Subject: [PATCH] Fix fire animation and dai notes

---
 public/src/js/game.js       |  4 ++--
 public/src/js/view.js       |  4 ++--
 public/src/js/viewassets.js | 10 +++++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/public/src/js/game.js b/public/src/js/game.js
index 915b938..b61cd38 100644
--- a/public/src/js/game.js
+++ b/public/src/js/game.js
@@ -91,7 +91,7 @@ class Game{
 				}else if(currentTime > endTime){
 					if(drumrollNotes){
 						circle.updateStatus(-1)
-						circle.played(0)
+						circle.played(0, false)
 						this.updateCurrentCircle()
 						if(this.controller.multiplayer == 1){
 							p2.send("drumroll", {
@@ -102,7 +102,7 @@ class Game{
 						if(!this.controller.autoPlayEnabled){
 							circle.updateStatus(-1)
 							var currentScore = 0
-							circle.played(currentScore)
+							circle.played(currentScore, type === "daiDon" || type === "daiKa")
 							this.controller.displayScore(currentScore, true)
 							this.updateCurrentCircle()
 							this.updateCombo(currentScore)
diff --git a/public/src/js/view.js b/public/src/js/view.js
index b0de68a..d744afb 100644
--- a/public/src/js/view.js
+++ b/public/src/js/view.js
@@ -31,7 +31,7 @@ class View{
 		this.currentScore = 0
 		this.special = ""
 		this.scoreDispCount = -1
-		this.scoreOpacity = 1.0
+		this.scoreOpacity = 1
 		
 		this.lastMeasure = 0
 		this.currentTimingPoint = 0
@@ -418,7 +418,7 @@ class View{
 			
 			var timeForDistance = this.posToMs(this.distanceForCircle + this.bigCircleSize / 2, speed)
 			var startingTime = circle.getMS() - timeForDistance
-			var finishTime = circle.getEndTime() + this.posToMs(this.slotX - this.taikoSquareW + this.bigCircleSize / 2, speed)
+			var finishTime = circle.getEndTime() + this.posToMs(this.slotX - this.taikoSquareW + this.bigCircleSize * 3, speed)
 			
 			if(!circle.getPlayed() || circle.getScore() === 0){
 				if(ms >= startingTime && ms <= finishTime){
diff --git a/public/src/js/viewassets.js b/public/src/js/viewassets.js
index 60a51f6..0faa67c 100644
--- a/public/src/js/viewassets.js
+++ b/public/src/js/viewassets.js
@@ -54,9 +54,12 @@ class ViewAssets{
 			var imgh = 370
 			var scale = 175
 			var ms = this.controller.getElapsedTime().ms
-			var grow = Math.min(100, ms - this.view.gogoTimeStarted) / 100
-			if(!this.view.gogoTime){
-				grow = 1 - grow
+			var elapsed = ms - this.view.gogoTimeStarted
+			if(this.view.gogoTime){
+				var grow = 3 - Math.min(200, elapsed) / 100
+				this.ctx.globalAlpha = Math.min(200, elapsed) / 200
+			}else{
+				var grow = 1 - Math.min(100, elapsed) / 100
 			}
 			var w = (this.view.barH * imgw) / scale * grow
 			var h = (this.view.barH * imgh) / scale * grow
@@ -72,6 +75,7 @@ class ViewAssets{
 				h: h,
 				callback: () => {
 					this.ctx.globalCompositeOperation = "source-over"
+					this.ctx.globalAlpha = 1
 				}
 			}
 		})