From f8b81a9795dddc692fa8ceeca2c063910404bcfc Mon Sep 17 00:00:00 2001
From: LoveEevee <LoveEevee@users.noreply.github.com>
Date: Thu, 20 Sep 2018 16:11:19 +0300
Subject: [PATCH] Fix Go-Go Time animation speed

---
 public/src/js/view.js       | 30 +++++++++---------------------
 public/src/js/viewassets.js | 23 +++++++++++++++++++----
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/public/src/js/view.js b/public/src/js/view.js
index 248c14e..b0de68a 100644
--- a/public/src/js/view.js
+++ b/public/src/js/view.js
@@ -714,6 +714,7 @@ class View{
 	toggleGogoTime(circle){
 		this.gogoTime = circle.gogoTime
 		this.gogoTimeStarted = circle.ms
+		
 		if(this.gogoTime){
 			this.assets.fireworks.forEach(fireworksAsset => {
 				fireworksAsset.setAnimation("normal")
@@ -726,24 +727,18 @@ class View{
 			this.assets.fire.setAnimation("normal")
 			var don = this.assets.don
 			don.setAnimation("gogostart")
-			don.setAnimationStart(circle.ms)
+			var length = don.getAnimationLength("gogo")
+			don.setUpdateSpeed(this.beatInterval / (length / 4))
+			var start = circle.ms - (circle.ms % this.beatInterval)
+			don.setAnimationStart(start)
 			var length = don.getAnimationLength("gogostart")
-			don.setAnimationEnd(circle.ms + length * don.speed, () => {
-				don.setAnimationStart(0)
-				if(this.gogoTime){
-					don.setAnimation("gogo")
-				}else{
-					don.setAnimation("normal")
-				}
-			})
+			don.setAnimationEnd(start + length * don.speed, don.normalAnimation)
 		}
 	}
 	drawGogoTime(){
 		var ms = this.controller.getElapsedTime().ms
+		
 		if(this.gogoTime){
-			if(this.gogoTimeStarted){
-				
-			}
 			var circles = this.controller.parsedSongData.circles
 			var lastCircle = circles[circles.length - 1]
 			var endTime = lastCircle.getEndTime() + 3000
@@ -755,7 +750,7 @@ class View{
 			}
 		}else{
 			if(this.assets.don.getAnimation() === "gogo"){
-				this.assets.don.setAnimation("normal")
+				this.assets.don.normalAnimation()
 			}
 			if(ms >= this.gogoTimeStarted + 100){
 				this.assets.fire.setAnimation(false)
@@ -776,14 +771,7 @@ class View{
 			var ms = this.controller.getElapsedTime().ms
 			don.setAnimationStart(ms)
 			var length = don.getAnimationLength("10combo")
-			don.setAnimationEnd(ms + length * don.speed, () => {
-				don.setAnimationStart(0)
-				if(this.gogoTime){
-					don.setAnimation("gogo")
-				}else{
-					don.setAnimation("normal")
-				}
-			})
+			don.setAnimationEnd(ms + length * don.speed, don.normalAnimation)
 		}
 	}
 	onmousemove(event){
diff --git a/public/src/js/viewassets.js b/public/src/js/viewassets.js
index 575c485..60a51f6 100644
--- a/public/src/js/viewassets.js
+++ b/public/src/js/viewassets.js
@@ -30,10 +30,25 @@ class ViewAssets{
 			11,11,11,11,10,9 ,8 ,7 ,13,12,12,13,14,15,16,17
 		], "don_anim_normal")
 		this.don.addFrames("10combo", 22, "don_anim_10combo")
-		this.don.addFrames("gogo", 56, "don_anim_gogo")
+		this.don.addFrames("gogo", [
+			42,43,43,44,45,46,47,48,49,50,51,52,53,54,
+			55,0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,11,12,13,
+			14,14,15,16,17,18,19,20,21,22,23,24,25,26,
+			27,28,29,30,31,32,33,34,35,36,37,38,39,40,41
+		], "don_anim_gogo")
 		this.don.addFrames("gogostart", 27, "don_anim_gogostart")
-		this.don.setAnimation("normal")
-		this.don.setUpdateSpeed(this.beatInterval / 16)
+		this.don.normalAnimation = () => {
+			if(this.view.gogoTime){
+				var length = this.don.getAnimationLength("gogo")
+				this.don.setUpdateSpeed(this.beatInterval / (length / 4))
+				this.don.setAnimation("gogo")
+			}else{
+				this.don.setAnimationStart(0)
+				this.don.setUpdateSpeed(this.beatInterval / 16)
+				this.don.setAnimation("normal")
+			}
+		}
+		this.don.normalAnimation()
 		this.fire = this.createAsset("bar", frame => {
 			var imgw = 360
 			var imgh = 370
@@ -92,7 +107,7 @@ class ViewAssets{
 		return asset
 	}
 	drawAssets(layer){
-		if(this.controller.multiplayer !== 2){
+		if(this.controller.multiplayer !== 2 || layer === "bar"){
 			this.allAssets.forEach(asset => {
 				if(layer === asset.layer){
 					asset.draw()