new score

public/src/js/autoscore.js

@@ -113,15 +113,15 @@ class AutoScore {
 			}
 			if (this.IsCommonCircle(circle)) { 
 				combo++;
-				if (combo % 100 === 0 && this.scoremode !== 1) { 
+				if (combo % 100 === 0 && this.scoremode === 2) { 
 					score += 10000;
 				}
 			}
 			var diff_mul = 0;
-			var multiplier = circle.gogoTime ? 1.2 : 1;
+			var multiplier = (this.scoremode !== 3 && circle.gogoTime) ? 1.2 : 1;
 			if (this.scoremode === 1) {
 				diff_mul = Math.max(0, Math.floor((Math.min(combo, 100) - 1) / 10));
-			} else { 
+			} else if (this.scoremode === 2) { 
 				if (combo >= 100) {
 					diff_mul = 8;
 				} else if (combo >= 50) {
@@ -132,23 +132,42 @@ class AutoScore {
 					diff_mul = 1;
 				}
 			}
-			switch (circle.type) { 
-				case "don":
-				case "ka": { 
-					score += Math.floor((init + diff * diff_mul) * multiplier / 10) * 10;
-					break;
-				}
-				case "daiDon":
-				case "daiKa": { 
-					score += Math.floor((init + diff * diff_mul) * multiplier / 5) * 10;
-					break;
-				}
-				case "balloon": { 
-					score += (5000 + 300 * circle.requiredHits) * multiplier;
-					break;
+			if (this.scoremode === 3) {
+				switch (circle.type) { 
+					case "don":
+					case "ka":
+					case "daiDon":
+					case "daiKa": { 
+						score += Math.floor(init / 10) * 10;
+						break;
+					}
+					case "balloon": { 
+						score +=  100 * circle.requiredHits;
+						break;
+					}
+					default: { 
+						break;
+					}
 				}
-				default: { 
-					break;
+			} else { 
+				switch (circle.type) { 
+					case "don":
+					case "ka": { 
+						score += Math.floor((init + diff * diff_mul) * multiplier / 10) * 10;
+						break;
+					}
+					case "daiDon":
+					case "daiKa": { 
+						score += Math.floor((init + diff * diff_mul) * multiplier / 5) * 10;
+						break;
+					}
+					case "balloon": { 
+						score += (5000 + 300 * circle.requiredHits) * multiplier;
+						break;
+					}
+					default: { 
+						break;
+					}
 				}
 			}
 		}

public/src/js/game.js

@@ -370,7 +370,11 @@ class Game{
 				this.controller.displayScore(score, true, false)
 			}
 			this.updateCombo(score)
-			this.updateGlobalScore(score, typeDai && keyDai ? 2 : 1, circle.gogoTime)
+			var mul = typeDai && keyDai ? 2 : 1;
+			if (this.songData.scoremode === 3 && typeDai) {
+				mul *= 0.5;
+			}
+			this.updateGlobalScore(score, mul, circle.gogoTime);
 			this.updateCurrentCircle()
 			if(circle.section){
 				this.resetSection()
@@ -405,9 +409,10 @@ class Game{
 		}
 		return true
 	}
-	checkBalloon(circle){
+	checkBalloon(circle) {
+		var score;
 		if(circle.timesHit >= circle.requiredHits - 1){
-			var score = 5000
+			score = this.songData.scoremode === 3 ? 100 : 5000;
 			this.updateCurrentCircle()
 			circle.hit()
 			circle.played(score)
@@ -417,7 +422,7 @@ class Game{
 				})
 			}
 		}else{
-			var score = 300
+			score = this.songData.scoremode === 3 ? 100 : 300;
 			circle.hit()
 		}
 		this.globalScore.drumroll++
@@ -453,7 +458,7 @@ class Game{
 		this.view.drumroll.push(circleAnim)
 		this.globalScore.drumroll++
 		this.sectionDrumroll++
-		this.globalScore.points += score * (dai ? 2 : 1)
+		this.globalScore.points += score * ((dai && this.songData.scoremode !== 3) ? 2 : 1)
 		this.view.setDarkBg(false)
 	}
 	getLastCircle(circles){
@@ -683,11 +688,11 @@ class Game{
 				diff_mul = 1;
 			}
 			score += this.songData.scorediff * diff_mul;
-		} else { 
+		} else if (this.songData.scoremode == 1) { 
 			score += Math.max(0, Math.floor((Math.min(this.combo, 100) - 1) / 10) * (this.songData.scoremode ? this.songData.scorediff : 100));
 		}
 		
-		if(gogoTime){
+		if(gogoTime && this.songData.scoremode !== 3){
 			multiplier *= 1.2
 		}
 		this.globalScore.points += Math.floor(score * multiplier / 10) * 10