new score

public/src/js/autoscore.js

@@ -162,7 +162,7 @@ class AutoScore {
 						break;
 					}
 					case "balloon": { 
-						score += (5000 + 300 * circle.requiredHits) * multiplier;
+						score += (5000 + 300 * (circle.requiredHits - 1)) * multiplier;
 						break;
 					}
 					default: { 
@@ -175,6 +175,9 @@ class AutoScore {
 	}
 	GetTargetScore(difficulty, level) { 
 		//console.log(difficulty, level)
+		if (this.scoremode === 3) {
+			return 1000000;
+		}
 		var ret = this.basic_max_score_list[difficulty][level];
 		if (!ret) { 
 			ret = this.basic_max_score_list[difficulty][0];
@@ -186,40 +189,59 @@ class AutoScore {
 		for (var circle of this.circles) { 
 			//alert(this.IsCommonCircle(circle));
 			if (this.IsCommonCircle(circle) && (!circle.branch || circle.branch.name === "master")) { 
-				combo++;
+				++combo;
 			}
 		}
 		return combo;
 	}
 	GetMaxPossibleInit(target) { 
 		var basic_score = 0;
-		if (this.scoremode !== 1) { 
+		if (this.scoremode === 2) { 
 			const max_combo = this.GetMaxCombo();
-			basic_score += Math.floor(max_combo / 100);
+			basic_score += Math.floor(max_combo / 100) * 10000;
 		}
 		var combo = 0;
 		for (var circle of this.circles) { 
 			if (circle.branch && circle.branch.name !== "master") { 
 				continue;
 			}
-			var multiplier = circle.gogoTime ? 1.2 : 1;
-			switch (circle.type) { 
-				case "don":
-				case "ka": { 
-					combo += (1 * multiplier);
-					break;
-				}
-				case "daiDon":
-				case "daiKa": { 
-					combo += (2 * multiplier);
-					break;
-				}
-				case "balloon": { 
-					basic_score += (5000 + 300 * circle.requiredHits) * multiplier;
-					break;
+			var multiplier = (circle.gogoTime && this.scoremode !== 3) ? 1.2 : 1;
+			if (this.scoremode === 3) {
+				switch (circle.type) { 
+					case "don":
+					case "ka": 
+					case "daiDon":
+					case "daiKa": { 
+						++combo;
+						break;
+					}
+					case "balloon": { 
+						basic_score += 100 * this.requiredHits;
+						break;
+					}
+					default: { 
+						break;
+					}
 				}
-				default: { 
-					break;
+			} else { 
+				switch (circle.type) { 
+					case "don":
+					case "ka": { 
+						combo += (1 * multiplier);
+						break;
+					}
+					case "daiDon":
+					case "daiKa": { 
+						combo += (2 * multiplier);
+						break;
+					}
+					case "balloon": { 
+						basic_score += (5000 + 300 * (circle.requiredHits - 1)) * multiplier;
+						break;
+					}
+					default: { 
+						break;
+					}
 				}
 			}
 		}